diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2400e8cfea10d1187cd1f8c9085a69a37d218b60..38531ceea5df5867469fca78254fef6ab426e898 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,29 +2,8 @@
 include: 'https://gitlab.cern.ch/linuxsupport/cronjobs/base/raw/master/gitlab-ci.yml'
 
 build_get-puppet-ips:
-  stage: build
-  tags:
-    - docker-image-build
-  script: "echo" # unused but this line is required by GitLab CI
+  extends: .build_image
   variables:
     CONTEXT_DIR: get-puppet-ips
-    TO: $CI_REGISTRY_IMAGE/get-puppet-ips:$CI_COMMIT_REF_NAME
-
-deploy:
-  extends: .nomad
-  stage: deploy
-  script:
-    - for j in *.nomad; do echo -e "\n${j}:"; nomad job run <(envsubst < $j); done
-  only:
-    - tags
-    - master
-
-deploy_dev:
-  extends: .nomad
-  stage: deploy
-  script:
-    - for j in *.nomad; do echo -e "\n${j}:"; nomad job run <(envsubst < $j); done
-  except:
-    - tags
-    - master
-  when: manual
+    DOCKER_FILE: get-puppet-ips/Dockerfile
+    TO: $CI_REGISTRY_IMAGE/get-puppet-ips
diff --git a/get-puppet-ips.nomad b/get-puppet-ips.nomad
index 6784d8c589ce6ba50830c1a7af2af50466cf3a99..ff28245080f33f412f0ed4f1d0d9005f8b3bcec3 100644
--- a/get-puppet-ips.nomad
+++ b/get-puppet-ips.nomad
@@ -13,8 +13,7 @@ job "${PREFIX}_get-puppet-ips" {
     driver = "docker"
 
     config {
-      image = "https://gitlab-registry.cern.ch/linuxsupport/cronjobs/get-puppet-ips/get-puppet-ips:${CI_COMMIT_REF_NAME}"
-      force_pull = ${FORCE_PULL}
+      image = "https://gitlab-registry.cern.ch/linuxsupport/cronjobs/get-puppet-ips/get-puppet-ips:${CI_COMMIT_SHORT_SHA}"
       logging {
         config {
           tag = "${PREFIX}_get-puppet-ips"