diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93b99e56cb45f9f09eaf17ed4d96819fefa77b06..4fc6e517da616ed8171437fe60663d0095f2dbe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,13 @@ aptly-image:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'collabora/production'
+      variables:
+        IMAGE: $CI_REGISTRY_IMAGE
+    - if: $CI_COMMIT_BRANCH != 'collabora/production'
+      variables:
+        IMAGE: $CI_REGISTRY_IMAGE/test
   script:
     - |
       cat << EOF > /kaniko/.docker/config.json
@@ -30,11 +37,11 @@ aptly-image:
       /kaniko/executor
       --context $CI_PROJECT_DIR
       --dockerfile $CI_PROJECT_DIR/docker/Dockerfile
-      --destination $CI_REGISTRY_IMAGE:$TAG_SHA
-      --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-      --build-arg REGISTRY=$CI_REGISTRY_IMAGE
+      --destination $IMAGE:$TAG_SHA
+      --destination $IMAGE:$CI_COMMIT_REF_SLUG
+      --build-arg REGISTRY=$IMAGE
       --build-arg TAG=$CI_COMMIT_REF_SLUG
       --build-arg APTLY_DEBUG=$APTLY_DEBUG
+      --compressed-caching=false
       --single-snapshot
-    - echo Pushed $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-              and $CI_REGISTRY_IMAGE:$TAG_SHA
+    - echo Pushed $IMAGE:$CI_COMMIT_REF_SLUG and $IMAGE:$TAG_SHA