diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89b44c8e923bc264116828cb8424673414e85acb..9df1821f8ed54f0bc18f87e75aee66a3bc67cfc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,8 +16,6 @@ test:
   image: 
     name: apache/airflow:2.1.3
     entrypoint: [""]
-  tags:
-    - laptop
   before_script:
     - echo "DEBUG:"
     - pip --version
@@ -37,8 +35,12 @@ test:
 build-custom-image:
   stage: build
   image: docker:latest
+  tags:
+    - laptop
   services:
     - docker:dind
+  when:
+    - manual
   variables:
     IMAGE_COMMIT_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:$CI_COMMIT_SHORT_SHA
     IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:latest