diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a624c8b..623ae68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 ---
 variables:
-  AWX_EE_DOCKER_IMAGE_EXTERN: "dev-harbor-01.smardigo.digital/awx/awx-custom-ee"
+  AWX_EE_DOCKER_IMAGE_EXTERN: "harbor-01.smardigo.digital/awx/awx-custom-ee"
   ANSIBLE_HOST_KEY_CHECKING: 'false'
   ANSIBLE_FORCE_COLOR: 'true'
 
@@ -32,18 +32,14 @@ lint-job:
   tags:
     - dind
 
-builder-job:
-  # A resource group ensures a job is mutually exclusive across different pipelines for the same project.
-  resource_group: dev
+.builder-job:
   stage: ansible-builder
   script:
     - cp $SSH_KEY_GITLAB_CI_BUILDER_FILE ansible-builder/context/id_ed25519
     - echo "Running docker build to build awx execution environment"
     - docker build -f ansible-builder/context/Dockerfile -t $AWX_EE_DOCKER_IMAGE_EXTERN:latest .
-    - docker push $AWX_EE_DOCKER_IMAGE_EXTERN:latest
+    - docker push ${STAGE}-${AWX_EE_DOCKER_IMAGE_EXTERN}:latest
   only:
-    refs:
-      - main
     changes:
       - pip-requirements
       - galaxy-requirements.yml
@@ -54,6 +50,46 @@ builder-job:
     - dind
     - harbor # 05.02.22 TODO some runners run into timeouts
 
+builder-job-dev:
+  extends: .builder-job
+  resource_group: dev
+  before_script:
+    - export STAGE=dev
+  only:
+    refs:
+      - main
+    changes:
+      - pip-requirements
+      - galaxy-requirements.yml
+      - ansible-builder/**/*
+
+builder-job-qa:
+  extends: .builder-job
+  resource_group: qa
+  before_script:
+    - export STAGE=qa
+  only:
+    refs:
+      - qa
+    changes:
+      - pip-requirements
+      - galaxy-requirements.yml
+      - ansible-builder/**/*
+
+builder-job-prodnso:
+  extends: .builder-job
+  resource_group: prodnso
+  before_script:
+    - export STAGE=prodnso
+  only:
+    refs:
+      - prodnso
+    changes:
+      - pip-requirements
+      - galaxy-requirements.yml
+      - ansible-builder/**/*
+
+
 ##################################################################################
 
 .run-ansible: