diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7839f3c..ab11a3d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,7 @@ build_android_debug:
       - build/app/outputs/apk/debug/app-debug.apk
   except:
     - main
+    - tags
 
 build_android_apk:
   stage: coverage
@@ -90,21 +91,9 @@ build_android_appbundle:
 upload_to_fdroid_repo:
   stage: release
   before_script:
-    ##
-    ## Install ssh-agent if not already installed.
-    ##
     - 'which ssh-agent || (sudo apt-get update -y && sudo apt-get install openssh-client -y )'
-    ##
-    ## Install rsync if not already installed.
-    ##
     - 'which rsync || (sudo apt-get update -y && sudo apt-get install rsync -y )'
-    ##
-    ## Install pcregrep if not already installed.
-    ##
     - 'which pcregrep || (sudo apt-get update -y && sudo apt-get install pcregrep -y )'
-    ##
-    ## Run ssh-agent (inside the build environment)
-    ##
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
     - mkdir -p ~/.ssh
@@ -118,7 +107,7 @@ upload_to_fdroid_repo:
   needs: ["build_android_apk"]
   resource_group: playstore_release
   only:
-    - tags
+    - main
 
 pages:
   stage: deploy
diff --git a/scripts/prepare-android-release.sh b/scripts/prepare-android-release.sh
index d9a43c27..76b402fa 100755
--- a/scripts/prepare-android-release.sh
+++ b/scripts/prepare-android-release.sh
@@ -5,5 +5,10 @@ echo "storePassword=${FDROID_KEY_PASS}" >> key.properties
 echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties
 echo "keyAlias=key" >> key.properties
 echo "storeFile=../key.jks" >> key.properties
-cd app && echo $GOOGLE_SERVICES >> google-services.json/..
+echo $PLAYSTORE_DEPLOY_KEY >> keys.json
+bundle install
+bundle update fastlane
+bundle exec fastlane set_build_code_beta
+cd app
+echo $GOOGLE_SERVICES >> google-services.json/..
 cd ../..
\ No newline at end of file
diff --git a/scripts/release-playstore-beta.sh b/scripts/release-playstore-beta.sh
index 8dc8f4f9..7b6a961b 100755
--- a/scripts/release-playstore-beta.sh
+++ b/scripts/release-playstore-beta.sh
@@ -2,12 +2,6 @@
 flutter channel stable
 flutter upgrade
 flutter pub get
-cd android
-bundle install
-bundle update fastlane
-echo $PLAYSTORE_DEPLOY_KEY >> keys.json
-bundle exec fastlane set_build_code_beta
-cd ..
 flutter build appbundle --target-platform android-arm,android-arm64,android-x64
 mkdir -p build/android
 cp build/app/outputs/bundle/release/app-release.aab build/android/