diff --git a/metadata/org.krita.yml b/metadata/org.krita.yml
index 459b46b911..e77bba1525 100644
--- a/metadata/org.krita.yml
+++ b/metadata/org.krita.yml
@@ -122,6 +122,55 @@ Builds:
         -p=apk
     ndk: r22b
 
+  - versionName: 5.0.6
+    versionCode: 1050008
+    commit: v5.0.6
+    timeout: 30000
+    sudo:
+      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
+        "android-28" -exec rm -rf {} \;
+      - apt-get update || apt-get update
+      - apt-get install -y build-essential
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
+    patch:
+      - v5.0.6.patch
+    output: build/krita_build_apk/build/outputs/apk/release/krita-armeabi-v7a-$$VERSION$$-release-unsigned.apk
+    scanignore:
+      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
+      - libs/flake/tests/data/store.zip
+      - libs/flake/tests/data/odf_frame_resource_store.zip
+    build:
+      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
+      - export ANDROID_ABI=armeabi-v7a
+      - export BUILD_ROOT=$(pwd)
+      - export ANDROID_API_LEVEL=23
+      - export CMAKE_ANDROID_NDK=$$NDK$$
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export SUBDIR=${BUILD_ROOT}/packaging/android
+      - mkdir ${BUILD_ROOT}/build
+      - git reset --hard $DEP_COMMIT
+      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=boost
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=qt
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=3rdparty
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=kf5
+      - git reset --hard $$COMMIT$$
+      - mkdir ${BUILD_ROOT}/po
+      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
+      - git apply 0001-remove_billing.patch
+      - git apply 0002-restore_abi.patch
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=krita-bin
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=apk
+    ndk: r22b
+
   - versionName: 4.4.2
     versionCode: 2040404
     commit: v4.4.2
@@ -217,6 +266,55 @@ Builds:
         -p=apk
     ndk: r22b
 
+  - versionName: 5.0.6
+    versionCode: 2050008
+    commit: v5.0.6
+    timeout: 30000
+    sudo:
+      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
+        "android-28" -exec rm -rf {} \;
+      - apt-get update || apt-get update
+      - apt-get install -y build-essential
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
+    patch:
+      - v5.0.6.patch
+    output: build/krita_build_apk/build/outputs/apk/release/krita-arm64-v8a-$$VERSION$$-release-unsigned.apk
+    scanignore:
+      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
+      - libs/flake/tests/data/store.zip
+      - libs/flake/tests/data/odf_frame_resource_store.zip
+    build:
+      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
+      - export ANDROID_ABI=arm64-v8a
+      - export BUILD_ROOT=$(pwd)
+      - export ANDROID_API_LEVEL=23
+      - export CMAKE_ANDROID_NDK=$$NDK$$
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export SUBDIR=${BUILD_ROOT}/packaging/android
+      - mkdir ${BUILD_ROOT}/build
+      - git reset --hard $DEP_COMMIT
+      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=boost
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=qt
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=3rdparty
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=kf5
+      - git reset --hard $$COMMIT$$
+      - mkdir ${BUILD_ROOT}/po
+      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
+      - git apply 0001-remove_billing.patch
+      - git apply 0002-restore_abi.patch
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=krita-bin
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=apk
+    ndk: r22b
+
   - versionName: 4.4.2
     versionCode: 3040404
     commit: v4.4.2
@@ -312,6 +410,55 @@ Builds:
         -p=apk
     ndk: r22b
 
+  - versionName: 5.0.6
+    versionCode: 3050008
+    commit: v5.0.6
+    timeout: 30000
+    sudo:
+      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
+        "android-28" -exec rm -rf {} \;
+      - apt-get update || apt-get update
+      - apt-get install -y build-essential
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
+    patch:
+      - v5.0.6.patch
+    output: build/krita_build_apk/build/outputs/apk/release/krita-x86-$$VERSION$$-release-unsigned.apk
+    scanignore:
+      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
+      - libs/flake/tests/data/store.zip
+      - libs/flake/tests/data/odf_frame_resource_store.zip
+    build:
+      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
+      - export ANDROID_ABI=x86
+      - export BUILD_ROOT=$(pwd)
+      - export ANDROID_API_LEVEL=23
+      - export CMAKE_ANDROID_NDK=$$NDK$$
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export SUBDIR=${BUILD_ROOT}/packaging/android
+      - mkdir ${BUILD_ROOT}/build
+      - git reset --hard $DEP_COMMIT
+      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=boost
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=qt
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=3rdparty
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=kf5
+      - git reset --hard $$COMMIT$$
+      - mkdir ${BUILD_ROOT}/po
+      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
+      - git apply 0001-remove_billing.patch
+      - git apply 0002-restore_abi.patch
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=krita-bin
+      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
+        -p=apk
+    ndk: r22b
+
   - versionName: 4.4.2
     versionCode: 4040404
     commit: v4.4.2
@@ -407,153 +554,6 @@ Builds:
         -p=apk
     ndk: r22b
 
-  - versionName: 5.0.6
-    versionCode: 1050008
-    commit: v5.0.6
-    timeout: 30000
-    sudo:
-      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
-        "android-28" -exec rm -rf {} \;
-      - apt-get update || apt-get update
-      - apt-get install -y build-essential
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake
-    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
-    patch:
-      - v5.0.6.patch
-    output: build/krita_build_apk/build/outputs/apk/release/krita-armeabi-v7a-$$VERSION$$-release-unsigned.apk
-    scanignore:
-      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
-      - libs/flake/tests/data/store.zip
-      - libs/flake/tests/data/odf_frame_resource_store.zip
-    build:
-      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
-      - export ANDROID_ABI=armeabi-v7a
-      - export BUILD_ROOT=$(pwd)
-      - export ANDROID_API_LEVEL=23
-      - export CMAKE_ANDROID_NDK=$$NDK$$
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export SUBDIR=${BUILD_ROOT}/packaging/android
-      - mkdir ${BUILD_ROOT}/build
-      - git reset --hard $DEP_COMMIT
-      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=boost
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=qt
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=3rdparty
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=kf5
-      - git reset --hard $$COMMIT$$
-      - mkdir ${BUILD_ROOT}/po
-      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
-      - git apply 0001-remove_billing.patch
-      - git apply 0002-restore_abi.patch
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=krita-bin
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=apk
-    ndk: r22b
-
-  - versionName: 5.0.6
-    versionCode: 2050008
-    commit: v5.0.6
-    timeout: 30000
-    sudo:
-      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
-        "android-28" -exec rm -rf {} \;
-      - apt-get update || apt-get update
-      - apt-get install -y build-essential
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake
-    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
-    patch:
-      - v5.0.6.patch
-    output: build/krita_build_apk/build/outputs/apk/release/krita-arm64-v8a-$$VERSION$$-release-unsigned.apk
-    scanignore:
-      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
-      - libs/flake/tests/data/store.zip
-      - libs/flake/tests/data/odf_frame_resource_store.zip
-    build:
-      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
-      - export ANDROID_ABI=arm64-v8a
-      - export BUILD_ROOT=$(pwd)
-      - export ANDROID_API_LEVEL=23
-      - export CMAKE_ANDROID_NDK=$$NDK$$
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export SUBDIR=${BUILD_ROOT}/packaging/android
-      - mkdir ${BUILD_ROOT}/build
-      - git reset --hard $DEP_COMMIT
-      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=boost
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=qt
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=3rdparty
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=kf5
-      - git reset --hard $$COMMIT$$
-      - mkdir ${BUILD_ROOT}/po
-      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
-      - git apply 0001-remove_billing.patch
-      - git apply 0002-restore_abi.patch
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=krita-bin
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=apk
-    ndk: r22b
-
-  - versionName: 5.0.6
-    versionCode: 3050008
-    commit: v5.0.6
-    timeout: 30000
-    sudo:
-      - find /opt/android-sdk/platforms -type d -mindepth 1 -maxdepth 1 -not -name
-        "android-28" -exec rm -rf {} \;
-      - apt-get update || apt-get update
-      - apt-get install -y build-essential
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake
-    init: sed -i '/com.android.billingclient/d' packaging/android/apk/build.gradle
-    patch:
-      - v5.0.6.patch
-    output: build/krita_build_apk/build/outputs/apk/release/krita-x86-$$VERSION$$-release-unsigned.apk
-    scanignore:
-      - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip
-      - libs/flake/tests/data/store.zip
-      - libs/flake/tests/data/odf_frame_resource_store.zip
-    build:
-      - export DEP_COMMIT=9e783a33345bbae786d7cc32014c0042af8e961a
-      - export ANDROID_ABI=x86
-      - export BUILD_ROOT=$(pwd)
-      - export ANDROID_API_LEVEL=23
-      - export CMAKE_ANDROID_NDK=$$NDK$$
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export SUBDIR=${BUILD_ROOT}/packaging/android
-      - mkdir ${BUILD_ROOT}/build
-      - git reset --hard $DEP_COMMIT
-      - echo 'gradle "$@"' > ${SUBDIR}/apk/gradlew
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=boost
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=qt
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=3rdparty
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=kf5
-      - git reset --hard $$COMMIT$$
-      - mkdir ${BUILD_ROOT}/po
-      - python3 ${BUILD_ROOT}/build-tools/copy_po.py
-      - git apply 0001-remove_billing.patch
-      - git apply 0002-restore_abi.patch
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=krita-bin
-      - ${SUBDIR}/androidbuild.sh --src=${BUILD_ROOT} --build-type=Release --build-root=${BUILD_ROOT}/build
-        -p=apk
-    ndk: r22b
-
   - versionName: 5.0.6
     versionCode: 4050008
     commit: v5.0.6