diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e9cb16d8e0bfdf0e1db6c0f5279cf4adbd404ce..0991fd76752f471f1b834b3a195a9f65bbf50648 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,7 +348,11 @@ package:
   before_script:
     # Set up auth
     - mkdir -p /root/.docker
-    - echo $DOCKER_AUTH_CONFIG > /root/.docker/config.json
+    - |
+      jq -n '{"auths": {"registry.dso.mil": {"auth": $bb_registry_auth}, "registry1.dso.mil": {"auth": $registry1_auth}, "registry.il2.dso.mil": {"auth": $il2_registry_auth} } }' \
+        --arg bb_registry_auth ${BB_REGISTRY_AUTH} \
+        --arg registry1_auth ${REGISTRY1_AUTH} \
+        --arg il2_registry_auth ${IL2_REGISTRY_AUTH} > /root/.docker/config.json
   script:
     - cp ./scripts/package/synker.yaml ./synker.yaml
     # Populate images list in synker config
diff --git a/scripts/deploy/00_deploy_flux.sh b/scripts/deploy/00_deploy_flux.sh
index e830e35eadafd3dc45725b614aab7b3fb00650f4..7c507dfe5634e7e349f4bccaf68a1128e8dacc00 100644
--- a/scripts/deploy/00_deploy_flux.sh
+++ b/scripts/deploy/00_deploy_flux.sh
@@ -4,6 +4,6 @@ set -ex
 
 # install flux with the dedicated helper script
 ./scripts/install_flux.sh \
-  --registry-username 'robot$bigbang' \
-  --registry-password "$REGISTRY1_PASSWORD" \
+  --registry-username 'robot$bb-dev-imagepullonly' \
+  --registry-password "${REGISTRY1_PASSWORD}" \
   --registry-email bigbang@bigbang.dev 
\ No newline at end of file
diff --git a/scripts/deploy/01_deploy_bigbang.sh b/scripts/deploy/01_deploy_bigbang.sh
index 84eea5176e8f2310898074953e28d44d27a22090..aa124ba052a8a7e6ca2e24215ec5c100b5157204 100755
--- a/scripts/deploy/01_deploy_bigbang.sh
+++ b/scripts/deploy/01_deploy_bigbang.sh
@@ -28,8 +28,8 @@ echo "Installing BigBang with the following configurations:"
 cat $CI_VALUES_FILE
 
 helm upgrade -i bigbang chart -n bigbang --create-namespace \
-  --set registryCredentials[0].username='robot$bigbang' \
-  --set registryCredentials[0].password="$REGISTRY1_PASSWORD" \
+  --set registryCredentials[0].username='robot$bb-dev-imagepullonly' \
+  --set registryCredentials[0].password="${REGISTRY1_PASSWORD}" \
   --set registryCredentials[0].registry=registry1.dso.mil \
   -f ${CI_VALUES_FILE}