diff --git a/UltraStar Play Companion/Assets/Editor/UltraStarPlayCompanionBuildTools.cs b/UltraStar Play Companion/Assets/Editor/UltraStarPlayCompanionBuildTools.cs
index 50c38090f..ee67e4549 100644
--- a/UltraStar Play Companion/Assets/Editor/UltraStarPlayCompanionBuildTools.cs	
+++ b/UltraStar Play Companion/Assets/Editor/UltraStarPlayCompanionBuildTools.cs	
@@ -5,11 +5,11 @@ public static class UltraStarPlayCompanionBuildTools
 {
     private static readonly string appName = "UltraStar Play Companion";
 
-    [MenuItem("Tools/Build/All")]
-    public static void BuildAll()
+    [MenuItem("Tools/Build/Build for release (signed apk, signed app bundle)")]
+    public static void BuildForRelease()
     {
-        BuildAndRunSignedAndroidApk();
-        BuildAndRunSignedAndroidAppBundle();
+        BuildSignedAndroidApk();
+        BuildSignedAndroidAppBundle();
     }
 
     [MenuItem("Tools/Build/Android - Build apk")]
@@ -26,6 +26,14 @@ public static void BuildAndRunAndroidApk()
         BuildUtils.PerformCustomBuild(customBuildOptions);
     }
 
+    [MenuItem("Tools/Build/Android - Build signed apk")]
+    public static void BuildSignedAndroidApk()
+    {
+        CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
+        customBuildOptions.configureKeystoreForAndroidBuild = true;
+        BuildUtils.PerformCustomBuild(customBuildOptions);
+    }
+
     [MenuItem("Tools/Build/Android - Build and run signed apk")]
     public static void BuildAndRunSignedAndroidApk()
     {
diff --git a/UltraStar Play Companion/ProjectSettings/ProjectSettings.asset b/UltraStar Play Companion/ProjectSettings/ProjectSettings.asset
index 2156f4221..03906756f 100644
--- a/UltraStar Play Companion/ProjectSettings/ProjectSettings.asset	
+++ b/UltraStar Play Companion/ProjectSettings/ProjectSettings.asset	
@@ -168,7 +168,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 5
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
diff --git a/UltraStar Play/Assets/Editor/UltraStarPlayBuildTools.cs b/UltraStar Play/Assets/Editor/UltraStarPlayBuildTools.cs
index 17744a019..c0fa24b52 100644
--- a/UltraStar Play/Assets/Editor/UltraStarPlayBuildTools.cs	
+++ b/UltraStar Play/Assets/Editor/UltraStarPlayBuildTools.cs	
@@ -5,15 +5,15 @@ public static class UltraStarPlayBuildTools
 {
     private static readonly string appName = "UltraStar Play";
 
-    [MenuItem("Tools/Build/All")]
+    [MenuItem("Tools/Build/Build for release (Windows, macOS, Linux, signed apk, signed app bundle)")]
     public static void BuildAll()
     {
         BuildWindows64();
+        BuildMacOS();
         BuildLinux64();
-        BuildMacOS();;
-        BuildAndRunAndroidApk();
-        BuildAndRunSignedAndroidAppBundle();
-        BuildIOS();
+        BuildSignedAndroidApk();
+        BuildSignedAndroidAppBundle();
+        // BuildIOS();
     }
 
     [MenuItem("Tools/Build/Windows64")]
@@ -48,6 +48,14 @@ public static void BuildAndRunAndroidApk()
         BuildUtils.PerformCustomBuild(customBuildOptions);
     }
 
+    [MenuItem("Tools/Build/Android - Build signed apk")]
+    public static void BuildSignedAndroidApk()
+    {
+        CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
+        customBuildOptions.configureKeystoreForAndroidBuild = true;
+        BuildUtils.PerformCustomBuild(customBuildOptions);
+    }
+
     [MenuItem("Tools/Build/Android - Build and run signed apk")]
     public static void BuildAndRunSignedAndroidApk()
     {
diff --git a/UltraStar Play/ProjectSettings/ProjectSettings.asset b/UltraStar Play/ProjectSettings/ProjectSettings.asset
index 85a5ab4a4..9bf9c0462 100644
--- a/UltraStar Play/ProjectSettings/ProjectSettings.asset	
+++ b/UltraStar Play/ProjectSettings/ProjectSettings.asset	
@@ -162,7 +162,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 5
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1