diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6551baac63d3d3a3e175d158bb27432efa1cf4fb..f23d6c9fe17e679088135090ebc5a86a84df65e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,11 +116,18 @@ workflow:
   variables:
     ENVIRONMENT: production
 
+.default-tags: 
+  tags: 
+    - $GEOMAG_TAG
+
+
 ## --------------------------------------------------
 # Init Stage
 ## --------------------------------------------------
 
 Poetry:
+  extends: 
+    - .default-tags
   artifacts:
     paths:
       - poetry.toml
@@ -143,6 +150,8 @@ Poetry:
 ## --------------------------------------------------
 
 Audit:
+  extends: 
+    - .default-tags
   needs:
     - Poetry
   script:
@@ -150,6 +159,8 @@ Audit:
   stage: test
 
 Build:
+  extends: 
+    - .default-tags
   needs:
     - Poetry
   script:
@@ -157,6 +168,8 @@ Build:
   stage: test
 
 Lint:
+  extends: 
+    - .default-tags
   needs:
     - Poetry
   script:
@@ -215,6 +228,8 @@ Build Docker Image:
     ## push image to user or project registries
     - docker tag "${LOCAL_IMAGE}" "${PROJECT_IMAGE_NAME}";
     - docker push "${PROJECT_IMAGE_NAME}";
+    - docker image rm "${PROJECT_IMAGE_NAME}" # removes local image after pushing
+
     
   stage: integration
   tags: