diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 143e5f61..ef9c1dc9 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -32,8 +32,8 @@ jobs:
             SOURCE_IMAGE_REGISTRY: ""
             SOURCE_IMAGE_NAME: ""
             SOURCE_IMAGE_TAG: ""
-            REGISTRY_USERNAME: ARTIFACTORY_USERNAME 
-            REGISTRY_PASSWORD: ARTIFACTORY_PASSWORD
+            REGISTRY_USERNAME_SECRET_NAME: ARTIFACTORY_USERNAME 
+            REGISTRY_PASSWORD_SECRET_NAME: ARTIFACTORY_PASSWORD
           - service: aries-endorser-db
             GIT_REPO_URL: hyperledger/aries-endorser-service
             PATH:  docker/wallet/config
@@ -45,16 +45,16 @@ jobs:
             SOURCE_IMAGE_REGISTRY: ""
             SOURCE_IMAGE_NAME: ""
             SOURCE_IMAGE_TAG: ""
-            REGISTRY_USERNAME: ARTIFACTORY_USERNAME 
-            REGISTRY_PASSWORD: ARTIFACTORY_PASSWORD 
+            REGISTRY_USERNAME_SECRET_NAME: ARTIFACTORY_USERNAME 
+            REGISTRY_PASSWORD_SECRET_NAME: ARTIFACTORY_PASSWORD 
           - service: aries-endorser-proxy
             DOCKER_FILE_PATH: Dockerfile  # The docker path, file, is the relative path to the docker file from the root of the repo.
             SOURCE_CONTEXT_DIR: proxy     # The context dir, context, sets the context for the build. i.e. where the build will source files from
             SOURCE_IMAGE_REGISTRY: "artifacts.developer.gov.bc.ca/docker-remote/"
             SOURCE_IMAGE_NAME: caddy
             SOURCE_IMAGE_TAG: latest
-            REGISTRY_USERNAME: ARTIFACTORY_USERNAME 
-            REGISTRY_PASSWORD: ARTIFACTORY_PASSWORD 
+            REGISTRY_USERNAME_SECRET_NAME: ARTIFACTORY_USERNAME 
+            REGISTRY_PASSWORD_SECRET_NAME: ARTIFACTORY_PASSWORD 
           - service: aries-endorser-api
             GIT_REPO_URL: hyperledger/aries-endorser-service
             DOCKER_FILE_PATH: Dockerfile.endorser # The docker path, file, is the relative path to the docker file from the root of the repo.
@@ -62,8 +62,8 @@ jobs:
             SOURCE_IMAGE_REGISTRY: artifacts.developer.gov.bc.ca/docker-remote/
             SOURCE_IMAGE_NAME: python
             SOURCE_IMAGE_TAG: 3.10-slim-buster
-            REGISTRY_USERNAME: ARTIFACTORY_USERNAME 
-            REGISTRY_PASSWORD: ARTIFACTORY_PASSWORD 
+            REGISTRY_USERNAME_SECRET_NAME: ARTIFACTORY_USERNAME 
+            REGISTRY_PASSWORD_SECRET_NAME: ARTIFACTORY_PASSWORD 
     outputs:
       aries-endorser-agent_digest: ${{ steps.digest.outputs.aries-endorser-agent_digest }} 
       aries-endorser-backup_digest: ${{ steps.digest.outputs.aries-endorser-backup_digest }} 
@@ -82,7 +82,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to image registry
-      if: matrix.SOURCE_IMAGE_REGISTRY != ''
+      if: matrix.SOURCE_IMAGE_REGISTRY  != '' && contains(fromJSON('["aries-endorser-db","aries-endorser-agent","aries-endorser-backup","aries-endorser-api","aries-endorser-proxy"]'), matrix.service)
       uses: docker/login-action@v3
       with:
        registry: ${{ matrix.SOURCE_IMAGE_REGISTRY }}
@@ -143,7 +143,6 @@ jobs:
         SOURCE_IMAGE_TAG: ${{ matrix.SOURCE_IMAGE_TAG }}
         file: ${{ matrix.SOURCE_CONTEXT_DIR }}/${{ matrix.DOCKER_FILE_PATH }}
 
-
     - name: Build and push Docker image
       id: docker_build
       if: contains(fromJSON('["aries-endorser-agent","aries-endorser-backup","aries-endorser-api","aries-endorser-proxy"]'), matrix.service)