diff --git a/.github/workflows/service-ci.yml b/.github/workflows/service-ci.yml
index e5fba3d1..8dee11e6 100644
--- a/.github/workflows/service-ci.yml
+++ b/.github/workflows/service-ci.yml
@@ -47,8 +47,13 @@ jobs:
       - name: Get Changes
         id: get_changes
         run: |
-          git fetch origin ${{ github.event.pull_request.base.ref }}
-          changed=$(git diff --name-only origin/${{ github.event.pull_request.base.ref }}...HEAD | tr '\n' ' ')
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            git fetch origin ${{ github.event.pull_request.base.ref }}
+            BASE="origin/${{ github.event.pull_request.base.ref }}"
+          else
+            BASE="HEAD~1"
+          fi
+          changed=$(git diff --name-only $BASE...HEAD | tr '\n' ' ')
           echo "changed=$changed" >> $GITHUB_OUTPUT
 
   ehr-repo:
diff --git a/services/mesh-forwarder/Dockerfile b/services/mesh-forwarder/Dockerfile
index 77f57a3f..6a448b4c 100644
--- a/services/mesh-forwarder/Dockerfile
+++ b/services/mesh-forwarder/Dockerfile
@@ -9,7 +9,7 @@ ENV POLL_FREQUENCY=60
 ENV FORWARDER_HOME=/mesh-forwarder
 ARG IMAGE_TAG=image_tag \
     ENV=bucket
-ENV BUILD_TAG=${IMAGE_TAG}
+ENV BUILD_TAG=${IMAGE_TAG}c
 
 RUN addgroup --system mesh && adduser --ingroup mesh --system mesh