diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca5cea04e54b967eb0552f75acfd4f5300a7046d..6f9d6b9204dc2cb67394119568fe6398504140be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ cache:
 
 stages:
   - build
+  - push
 #  - release
 #  - deploy
 
@@ -22,6 +23,10 @@ before_script:
   - echo "KEY_PATH=../circuli_key.jks" > signing.properties
   - echo "KEY_PASSWORD=${KEY_PASSWORD}" >> signing.properties
   - echo "ALIAS_NAME=${ALIAS_NAME}" >> signing.properties
+  - apt-get update -qy && apt-get upgrade -qy
+  - apt-get install -y git
+  - git config user.email "taras@futo.org"
+  - git config user.name "ci-bot"
 
 buildFdroid:
   stage: build
@@ -29,20 +34,28 @@ buildFdroid:
     - echo "Building F-Droid apk"
     - ./gradlew clean
     - ./gradlew assembleFdroidRelease
-    - apt-get update -qy && apt-get upgrade -qy
-    - apt-get install -y git
-    - git config user.email "taras@futo.org"
-    - git config user.name "ci-bot"
+
+pushToMain:
+  stage: push
+  script:
     - git remote set-url origin https://gitlab-ci-token:${GITLAB_ACCESS_TOKEN}@gitlab.futo.org/circles/circles-android.git
     - git add -f app/build/outputs/apk/fdroid/release/circles-$CI_COMMIT_TAG-fdroid-release.apk
     - git mv app/build/outputs/apk/fdroid/release/circles-$CI_COMMIT_TAG-fdroid-release.apk .
     - git commit -m "Add F-Droid release apk $CI_COMMIT_TAG"
     - git push origin HEAD:main -o ci.skip
-    - git remote set-url origin https://gitlab-ci-token:${FDROID_REPO_GITLAB_ACCESS_TOKEN}@gitlab.futo.org/circles/circles-fdroid-repo.git
+
+pushToFdroidRepo:
+  stage: push
+  script:
+    - cd ..
+    - git clone https://gitlab-ci-token:${FDROID_REPO_GITLAB_ACCESS_TOKEN}@gitlab.futo.org/circles/circles-fdroid-repo.git
+    - cp circles-android/circles-$CI_COMMIT_TAG-fdroid-release.apk circles-fdroid-repo/fdroid/repo
+    - cd circles-fdroid-repo
     - git add -f circles-$CI_COMMIT_TAG-fdroid-release.apk
-    - git mv circles-$CI_COMMIT_TAG-fdroid-release.apk fdroid/repo
     - git commit -m "Add F-Droid release apk $CI_COMMIT_TAG"
     - git push origin HEAD:main
+  needs: ["pushToMain"]
+
 
 #createGitlabRelease:
 #  stage: release
@@ -56,7 +69,7 @@ buildFdroid:
 #    assets:
 #      links:
 #        - name: 'F-Droid release apk $CI_COMMIT_TAG'
-#          url: 'https://gitlab.futo.org/circles/circles-android/-/raw/main/app/build/outputs/apk/fdroid/release/circles-$CI_COMMIT_TAG-fdroid-release.apk?ref_type=heads'
+#          url: 'https://gitlab.futo.org/circles/circles-android/-/raw/main/circles-$CI_COMMIT_TAG-fdroid-release.apk?ref_type=heads'
 #
 #
 #