diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12c008e..7bbeeee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,23 +2,25 @@ stages:
   - preparation
   - build
   - deploy
+  
+cache:
+  paths:
+    - tmp/
 
 preparation-flatpak:
-  image: black0/flatpak
+  image: alpine/git
   stage: preparation
+  before_script:
+    - mkdir tmp
   script:
-    - cd ../
+    - cd tmp
     - git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo"
-    - cd matrique
-  
-  artifacts:
-    untracked: true
-    paths:
-    - ../matrique-repo
+    - cd ../
   
 build-native:
   image: rabits/qt:5.11-desktop
   stage: build
+  cache: {}
   before_script:
     - git submodule update --init --recursive
   script:
@@ -38,12 +40,8 @@ build-flatpak:
   script:
     - gpg2 -v --import <(echo "$GPG_SECRET_KEY")
     - cd flatpak
-    - flatpak-builder --repo=../../matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2
+    - flatpak-builder --repo=../tmp/matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2
     - cd ../
-  artifacts:
-    untracked: true
-    paths:
-    - ../matrique-repo
     
 deploy-flatpak:
   image: fedora:latest
@@ -52,7 +50,7 @@ deploy-flatpak:
     - git config --global user.name "$GIT_NAME"
     - git config --global user.email "$GIT_EMAIL"
   script:
-    - cd ../matrique-repo
+    - cd tmp/matrique-repo
     - git add -A
     - git commit -m "$CI_COMMIT_MESSAGE"
     - git push origin master
\ No newline at end of file