diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c6d6b4..ee15614 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,8 +137,8 @@ build-bleeding-edge:
 
 .deploy:
   image: curlimages/curl:latest
-  before_script: 
-    - apt update && apt -y install openssh-server
+  script:
+    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $FILE "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/$PACKAGE/$CI_COMMIT_SHORT_SHA/$PACKAGE-$CI_COMMIT_SHORT_SHA.apk"'
 
 deploy-develop:
   extends: .deploy
@@ -148,18 +148,12 @@ deploy-develop:
   variables:
     FILE: app/build/outputs/apk/debug/app-debug.apk
     PACKAGE: audio.funkwhale.ffa.dev
-  script:
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $FILE "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/$PACKAGE/$CI_COMMIT_SHORT_SHA/$PACKAGE-$CI_COMMIT_SHORT_SHA.apk"'
 
 deploy-release:
   extends: .deploy
   stage: deploy
   only:
     - tags
-  script:
-    - eval `ssh-agent -s`
-    - ssh-add <(echo "$SSH_PRIVATE_KEY")
-    - scp -P22103 -o StrictHostKeyChecking=no app/build/outputs/apk/release/app-release.apk fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/repo/audio.funkwhale.ffa-$CI_COMMIT_TAG.apk
-    - scp -P22103 -o StrictHostKeyChecking=no app/build/outputs/apk/release/output-metadata.json fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/output-metadata.json
-    - scp -P22103 -o StrictHostKeyChecking=no metadata/audio.funkwhale.android.yml fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/metadata/audio.funkwhale.ffa.yml      
-    - ssh -p22103 -o StrictHostKeyChecking=no fdroid@apps.funkwhale.audio 'docker run --rm -u $(id -u):$(id -g) -v /srv/fdroid/fdroid/develop:/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:master update'
+  variables:
+    FILE: app/build/outputs/apk/release/app-release.apk
+    PACKAGE: audio.funkwhale.ffa