diff --git a/templates/xpub-collabra-deployment.yaml b/templates/xpub-collabra-deployment.yaml
index 654c1e640a4d0347b1d12579a2304100890b4eac..535ce9e566a0e8bea0cf7b150a7ecba050119bcd 100644
--- a/templates/xpub-collabra-deployment.yaml
+++ b/templates/xpub-collabra-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       initContainers:
       - name: seed-${CI_ENVIRONMENT_SLUG}
-        image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
+        image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
         imagePullPolicy: Always
         workingDir: /home/xpub/packages/${PACKAGE_NAME}
         volumeMounts:
@@ -40,7 +40,7 @@ spec:
         command: ["/bin/bash", "/init-scripts/createdb.sh"]
       containers:
       - name: ${CI_ENVIRONMENT_SLUG}
-        image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
+        image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
         imagePullPolicy: Always
         workingDir: /home/xpub/packages/${PACKAGE_NAME}
         env:
diff --git a/templates/xpub-ui-deployment.yaml b/templates/xpub-ui-deployment.yaml
index 7ec027b0e5ffa5fa68d5584d9420084b1293c156..c92429b9745c7cb83a6ee37c77dc02ead3218d74 100644
--- a/templates/xpub-ui-deployment.yaml
+++ b/templates/xpub-ui-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: ${CI_ENVIRONMENT_SLUG}
-        image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
+        image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA} 
         workingDir: /home/xpub/packages/xpub-ui/styleguide
         command: ["python", "-m", "SimpleHTTPServer", "3000"]
         imagePullPolicy: Always