diff --git a/app/build.gradle b/app/build.gradle
index 58bf40412..c5e77fe5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,6 +35,9 @@ android {
                 keyPassword System.getenv("KODI_ANDROID_KEY_PASSWORD")
                 storeFile file(System.getenv("KODI_ANDROID_STORE_FILE"))
                 storePassword System.getenv("KODI_ANDROID_STORE_PASSWORD")
+                enableV1Signing true
+                enableV2Signing true
+                enableV3Signing true
             }
         }
     }
@@ -50,6 +53,7 @@ android {
         release {
             if (System.getenv("KODI_ANDROID_STORE_FILE") != null) {
                 signingConfig signingConfigs.release
+                zipAlignEnabled true
             }
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
diff --git a/tools/jenkins/android/packaging/apksign b/tools/jenkins/android/packaging/apksign
deleted file mode 100755
index a4eea5dfe..000000000
--- a/tools/jenkins/android/packaging/apksign
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-usage(){
-	echo "Usage: $0 <keystore_filename> <keystore_password> <key_name> [<key_password>]"
-	exit 1
-}
-
-[[ $# -lt 3 ]] && usage
-
-WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
-
-SIGN_STORE=$1
-SIGN_STOREPASS=$2
-SIGN_KEY=$3
-SIGN_KEYPASS=$4 
-
-
-
-echo "Signing..."
-$ZIPALIGN_JENKINS -f 4 $WORKSPACE/app/build/outputs/apk/release/app-release-unsigned.apk $WORKSPACE/kore-release.apk
-$APKSIGNER_JENKINS sign --ks $SIGN_STORE --ks-key-alias $SIGN_KEY --ks-pass pass:$SIGN_STOREPASS $WORKSPACE/kore-release.apk
-echo "$WORKSPACE/kore-release.apk created"