diff --git a/.github/workflows/base-java-service-jobs.yml b/.github/workflows/base-java-service-jobs.yml
index 33e3bf94..54ec0388 100644
--- a/.github/workflows/base-java-service-jobs.yml
+++ b/.github/workflows/base-java-service-jobs.yml
@@ -95,40 +95,22 @@ jobs:
 
       - name: Docker Build and Tag
         env:
-          REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           REPOSITORY: ${{inputs.image_prefix}}${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
-          TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
-          fi
-          docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
+          docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .
 
       - name: Docker Publish
         if: ${{ inputs.is_deployment }}
         env:
-          REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           REPOSITORY: ${{ inputs.image_prefix }}${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
-          TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
-          fi
           docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
-          docker push "$REGISTRY/$REPOSITORY:latest"
-
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
-          fi
 
   deploy_infra:
     name: Deploy Infrastructure
diff --git a/.github/workflows/base-node-service-jobs.yml b/.github/workflows/base-node-service-jobs.yml
index 2d1f7001..98a0f30f 100644
--- a/.github/workflows/base-node-service-jobs.yml
+++ b/.github/workflows/base-node-service-jobs.yml
@@ -128,40 +128,22 @@ jobs:
 
       - name: Docker Build and Tag
         env:
-          REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           REPOSITORY: deductions/${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
-          TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
-          fi
-          docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
+          docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .
 
       - name: Docker Publish
         if: ${{ inputs.is_deployment }}
         env:
-          REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           REPOSITORY: deductions/${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
-          TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
-          fi
           docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
-          docker push "$REGISTRY/$REPOSITORY:latest"
-
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
-          fi
 
   deploy_infra:
     name: Deploy Infrastructure
diff --git a/.github/workflows/base-python-service-jobs.yml b/.github/workflows/base-python-service-jobs.yml
index 3e04230f..30cd12bf 100644
--- a/.github/workflows/base-python-service-jobs.yml
+++ b/.github/workflows/base-python-service-jobs.yml
@@ -81,30 +81,18 @@ jobs:
 
       - name: Build Docker Image
         env:
-          REF_NAME: ${{ github.ref_name }}
           ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG" -t "$ECR_URI:latest")
-          if [ -n "${REF_NAME:-}" ]; then
-            REF_TAG="${REF_NAME//\//-}"
-            TAG_ARGS+=(-t "$ECR_URI:$REF_TAG")
-          fi
-          docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .
+          docker build -t "$ECR_URI:$IMAGE_TAG" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .
 
       - name: Push Docker Image
         if: ${{ inputs.is_deployment }}
         env:
-          REF_NAME: ${{ github.ref_name }}
           ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           docker push "$ECR_URI:$IMAGE_TAG"
-          docker push "$ECR_URI:latest"
-          if [ -n "${GITHUB_REF_NAME:-}" ]; then
-            REF_TAG="${GITHUB_REF_NAME//\//-}"
-            docker push "$ECR_URI:$REF_TAG"
-          fi
 
   deploy_infra:
     if: ${{ inputs.deploy_infra && inputs.is_deployment }}
diff --git a/services/ehr-out-service/package-lock.json b/services/ehr-out-service/package-lock.json
index 6279fb6b..b7e89072 100644
--- a/services/ehr-out-service/package-lock.json
+++ b/services/ehr-out-service/package-lock.json
@@ -28,6 +28,7 @@
         "swagger-ui-express": "^4.3.0",
         "traverse": "^0.6.6",
         "utils-deep-clone": "^0.0.3",
+        "uuid": "^8.3.2",
         "winston": "^3.6.0",
         "xml2js": "^0.5.0"
       },
@@ -48,7 +49,6 @@
         "nodemon": "^2.0.19",
         "prettier": "2.6.0",
         "supertest": "^6.3.3",
-        "uuid": "^8.3.2",
         "wait-for-expect": "^3.0.2"
       }
     },
@@ -16234,7 +16234,6 @@
     },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
@@ -28735,8 +28734,7 @@
       "version": "1.0.1"
     },
     "uuid": {
-      "version": "8.3.2",
-      "dev": true
+      "version": "8.3.2"
     },
     "v8-to-istanbul": {
       "version": "9.2.0",
diff --git a/services/ehr-out-service/package.json b/services/ehr-out-service/package.json
index 359d1295..30e111a9 100644
--- a/services/ehr-out-service/package.json
+++ b/services/ehr-out-service/package.json
@@ -42,6 +42,7 @@
     "swagger-ui-express": "^4.3.0",
     "traverse": "^0.6.6",
     "utils-deep-clone": "^0.0.3",
+    "uuid": "^8.3.2",
     "winston": "^3.6.0",
     "xml2js": "^0.5.0"
   },
@@ -62,7 +63,6 @@
     "nodemon": "^2.0.19",
     "prettier": "2.6.0",
     "supertest": "^6.3.3",
-    "uuid": "^8.3.2",
     "wait-for-expect": "^3.0.2"
   },
   "overrides": {