diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index fb64ba37..5c4a5a97 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -32,18 +32,18 @@ jobs:
       matrix:
         include:
           - service: aries-endorser-agent
-            GIT_REPO_URL: ${{ inputs.service.endoser.agent_git_repo_url || 'hyperledger/aries-endorser-service' }}
-            GIT_REF:  ${{ inputs.service.endoser.git_ref || '' }}
-            DOCKER_FILE_PATH: ${{ inputs.service.endoser.docker_file_path || 'Dockerfile.acapy' }} # The docker path, file, is the relative path to the docker file from the root of the repo.
-            SOURCE_CONTEXT_DIR:  ${{ inputs.service.endoser.source_context_dir || 'docker/acapy' }}    # The context dir, context, sets the context for the build. i.e. where the build will source files from 
-            SOURCE_IMAGE_REGISTRY: ${{ inputs.service.endoser.source_image_registry || '' }}
-            SOURCE_IMAGE_NAME: ${{ inputs.service.endoser.source_image_name || '' }}
-            SOURCE_IMAGE_TAG: ${{ inputs.service.endoser.source_image_tag || '' }} 
-            REGISTRY_USERNAME_SECRET_NAME: ${{ inputs.service.endoser.username_secret_name || '' }} 
-            REGISTRY_PASSWORD_SECRET_NAME: ${{ inputs.service.endoser.password_secret_name || '' }}
+            GIT_REPO_URL: ${{ inputs.service.endoser-agent.git_repo_url || 'hyperledger/aries-endorser-service' }}
+            GIT_REF:  ${{ inputs.service.endoser-agent.git_ref || '' }}
+            DOCKER_FILE_PATH: ${{ inputs.service.endoser-agent.docker_file_path || 'Dockerfile.acapy' }} # The docker path, file, is the relative path to the docker file from the root of the repo.
+            SOURCE_CONTEXT_DIR:  ${{ inputs.service.endoser-agent.source_context_dir || 'docker/acapy' }}    # The context dir, context, sets the context for the build. i.e. where the build will source files from 
+            SOURCE_IMAGE_REGISTRY: ${{ inputs.service.endoser-agent.source_image_registry || '' }}
+            SOURCE_IMAGE_NAME: ${{ inputs.service.endoser-agent.source_image_name || '' }}
+            SOURCE_IMAGE_TAG: ${{ inputs.service.endoser-agent.source_image_tag || '' }} 
+            REGISTRY_USERNAME_SECRET_NAME: ${{ inputs.service.endoser-agent.username_secret_name || '' }} 
+            REGISTRY_PASSWORD_SECRET_NAME: ${{ inputs.service.endoser-agent.password_secret_name || '' }}
           - service: aries-endorser-db
-            GIT_REPO_URL: hyperledger/aries-endorser-service
-            GIT_REF: ""
+            GIT_REPO_URL: ${{ inputs.service.endoser-db.git_repo_url || 'hyperledger/aries-endorser-db' }}
+            GIT_REF: ${{ inputs.service.endoser-db.git_ref || '' }}
             SOURCE_CONTEXT_DIR: docker/wallet/config
             SOURCE_IMAGE_REGISTRY: "quay.io/"  
             SOURCE_IMAGE_NAME: "fedora/postgresql-13"
@@ -161,7 +161,7 @@ jobs:
         path_context: ${{ matrix.SOURCE_CONTEXT_DIR}}
         builder_image: "${{ matrix.SOURCE_IMAGE_REGISTRY }}${{ matrix.SOURCE_IMAGE_NAME }}:${{ matrix.SOURCE_IMAGE_TAG }}"
         image: ${{ matrix.service }}
-        tags: ${{ steps.extract.outputs.tags }}         
+        tags: ${{ steps.extract.outputs.single_tag }}         
       # labels would have to be added to the image after the S2I build
 
     - name: Apply Labels and tags to Database Image