diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9992166e794aff1406eb6989bb9c6089480d9316..6a9507eb7b4ac4d2fe06fb8ef3568719e4775464 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,6 @@ variables:
 .dekko:
   stage: build
   image: clickable/ci-16.04-$ARCH:$CLICKABLE_VERSION
-  tags:
-    - docker
   script:
     - git clone https://gitlab.com/dekkan/dekko.git --recursive 
     - cd dekko
@@ -51,13 +49,15 @@ dekko:amd64:
     paths:
       - '*.AppImage'
     expire_in: 1 week
-  dependencies:
-    - build
 
 appimage:arm64:
   <<: *arm64
   extends: .appimage
+  dependencies:
+    - dekko:arm64
 
 appimage:amd64:
   <<: *amd64
-  extends: .appimage
\ No newline at end of file
+  extends: .appimage
+  dependencies:
+    - dekko:amd64
diff --git a/appimage-amd64.yml b/appimage-amd64.yml
index 2ec6b479084a66d473a850922140c94878f3268d..01d139b09b819f0c103545f59841fa550ebf8580 100644
--- a/appimage-amd64.yml
+++ b/appimage-amd64.yml
@@ -2,14 +2,17 @@ version: 1
 
 script:
   - rm -rf AppDir || true
-  - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
+  # copy click-app binaries
+  - mkdir -p AppDir/usr
   - cp -r dekko/build/x86_64-linux-gnu/build/install-root/* AppDir/usr
+  # move qt5 parts to the right paths
   - mkdir -p AppDir/usr/lib/x86_64-linux-gnu/qt5/qml/
   - mv AppDir/usr/lib/x86_64-linux-gnu/{Dekko,QuickFlux,PlugMan,MazDB} AppDir/usr/lib/x86_64-linux-gnu/qt5/qml/
   - mkdir -p AppDir/usr/share/qt5/translations/
   - mv AppDir/usr/lib/x86_64-linux-gnu/*.qm AppDir/usr/share/qt5/translations/
-  
-  - cp click-app/dekko.png AppDir/usr/share/icons/hicolor/256x256/apps/
+  # move app icon to the right path
+  - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
+  - mv AppDir/usr/dekko.png AppDir/usr/share/icons/hicolor/256x256/apps/
 
   # add fake upstart start
   - mkdir -p AppDir/usr/bin