diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c2f71f..3bc76ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,19 @@
 include: invent/admin-docker.yml
 
-stages:
-  - build
-  - cleanup
-
 kdeorg/appimage-base:
   extends: .docker
   variables:
     CONTAINER_IMAGE: kdeorg/appimage-base
     DOCKERFILE_PATH: system-images/appimage-base
   only:
     variables:
       - $BUILD_IMAGE == "appimage-base"
 
 kdeorg/staticweb:
   extends: .docker
   variables:
     CONTAINER_IMAGE: kdeorg/staticweb
     DOCKERFILE_PATH: system-images/static-websites
   only:
     variables:
       - $BUILD_IMAGE == "staticweb"
-
-cleanup:
-  stage: cleanup
-  tags:
-    - docker
-  script:
-    - docker rmi $BUILD_IMAGE
-  only:
-    variables:
-      - $BUILD_IMAGE
diff --git a/invent/admin-docker.yml b/invent/admin-docker.yml
index d6c084c..e94bd63 100644
--- a/invent/admin-docker.yml
+++ b/invent/admin-docker.yml
@@ -1,6 +1,17 @@
+stages:
+  - build
+  - cleanup
+
 .docker:
   stage: build
   tags:
     - docker
   script:
     - docker build -t $CONTAINER_IMAGE --no-cache=true --pull=true $DOCKERFILE_PATH
+
+cleanup:
+  stage: cleanup
+  tags:
+    - docker
+  script:
+    - docker images -qf dangling=true | xargs docker rmi