diff --git a/cicd/android/android_release.keystore b/cicd/android/android_release.keystore
deleted file mode 100644
index b8d55ca7380da897a4df89fd9b6c524e2c4200f2..0000000000000000000000000000000000000000
Binary files a/cicd/android/android_release.keystore and /dev/null differ
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index 659a333daf0c01900ae15d0595f289b5ccbdffa4..74aaa52fa0690226f5137626f072aaaebb18477e 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -44,10 +44,13 @@
   - cmake --build ${QDS_CI_JOB_BUILD_PATH} --target aab
 
 .copy-and-sign-apks: &copy-and-sign-apks
+  - QDS_CI_KEYSTORE_PATH=$(pwd)/android_release.keystore
+  - QDS_CI_APK_SIGNER_PATH=${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner
+  - echo ${QDS_VAR_KEYSTORE} | base64 -d > ${QDS_CI_KEYSTORE_PATH}
   - cp -r ${QDS_CI_JOB_BUILD_PATH}/src/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_APP}
   - cp -r ${QDS_CI_JOB_BUILD_PATH}/tests/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}
-  - echo ${QDS_VAR_PASS} | ${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner sign -verbose -ks ${CI_PROJECT_DIR}/cicd/android/android_release.keystore -out ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk
-  - echo ${QDS_VAR_PASS} | ${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner sign -verbose -ks ${CI_PROJECT_DIR}/cicd/android/android_release.keystore -out ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
+  - echo ${QDS_VAR_PASS} | ${QDS_CI_APK_SIGNER_PATH} sign -verbose -ks ${QDS_CI_KEYSTORE_PATH} -out ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk
+  - echo ${QDS_VAR_PASS} | ${QDS_CI_APK_SIGNER_PATH} sign -verbose -ks ${QDS_CI_KEYSTORE_PATH} -out ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
   - rm -f ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
 
 .copy-and-sign-aab: &copy-and-sign-aab
@@ -61,8 +64,6 @@
 build-android:
   extends: .pipeline_common
   stage: build
-  # rules:
-  #   - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
   parallel:
     matrix:
       - QDS_CI_JOB_TARGET_ARCH: "arm64_v8a"
diff --git a/src/backend/settings.cpp b/src/backend/settings.cpp
index 3e6eccfb927ae5a2d96dbbcc7715cba10f3347a5..cb0459635b8144597c123f8f55deb54b501c696e 100644
--- a/src/backend/settings.cpp
+++ b/src/backend/settings.cpp
@@ -11,8 +11,9 @@
 /*
     Example of a settings.json file:
     {
-        "autoScale": true
-        "deviceUuid": "1234567890"
+        "autoScale": true,
+        "deviceUuid": "1234567890",
+        "keepScreenOn": false
     }
 */