diff --git a/.github/workflows/e2e-on-release.yml b/.github/workflows/e2e-on-release.yml
index aced8cc97..724b89886 100644
--- a/.github/workflows/e2e-on-release.yml
+++ b/.github/workflows/e2e-on-release.yml
@@ -51,15 +51,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Create Temporary Directory to Download Docker Images
+        id: tempdir
+        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
+
       - name: Download Docker Images
         uses: actions/download-artifact@v3
         with:
           name: e2e_release_env_images
-          path: /tmp
+          path: ${{ steps.tempdir.outputs.tmpdir }}
 
       - name: Load Docker Images
         run: |
-          tar xzvf /tmp/e2e_release_env_images.tar.gz
+          gzip -d ${{ steps.tempdir.outputs.tmpdir }}/e2e_release_env_images.tar.gz
           docker load --input e2e_release_env_images.tar
           docker image ls -a
 
@@ -108,11 +112,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Create Temporary Directory to Download Docker Images
+        id: tempdir
+        run: echo "tmpdir=$(mktemp -d)" >> "$GITHUB_OUTPUT"
+
       - name: Download Docker Images
         uses: actions/download-artifact@v3
         with:
           name: e2e_release_env_images
-          path: /tmp
+          path: ${{ steps.tempdir.outputs.tmpdir }}
 
       - name: Load Docker Images
         run: |
@@ -169,7 +177,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: e2e_release_env_images
-          path: /tmp
+          path: ${{ steps.tempdir.outputs.tmpdir }}
 
       - name: Load Docker Images
         run: |
@@ -226,7 +234,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: e2e_release_env_images
-          path: /tmp
+          path: ${{ steps.tempdir.outputs.tmpdir }}
 
       - name: Load Docker Images
         run: |
@@ -283,7 +291,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: e2e_release_env_images
-          path: /tmp
+          path: ${{ steps.tempdir.outputs.tmpdir }}
 
       - name: Load Docker Images
         run: |
diff --git a/e2e_test_support_files/commit_and_export_images.sh b/e2e_test_support_files/commit_and_export_images.sh
index 3bb09fd75..384699d10 100644
--- a/e2e_test_support_files/commit_and_export_images.sh
+++ b/e2e_test_support_files/commit_and_export_images.sh
@@ -13,4 +13,4 @@ docker commit $db_container_id db
 docker save frontend gateway backend db > e2e_release_env_images.tar
 
 # compress the file (to decrease the upload file size)
-tar czvf e2e_release_env_images.tar.gz e2e_release_env_images.tar
+gzip -c e2e_release_env_images.tar > e2e_release_env_images.tar.gz
diff --git a/e2e_test_support_files/docker-compose-build.yml b/e2e_test_support_files/docker-compose-build.yml
index b687531d7..a4527ce0d 100644
--- a/e2e_test_support_files/docker-compose-build.yml
+++ b/e2e_test_support_files/docker-compose-build.yml
@@ -45,8 +45,6 @@ services:
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:8080/openmrs" ]
       timeout: 5s
-    ports:
-      - 8080:8080
 
   # MariaDB
   db:
diff --git a/e2e_test_support_files/extract_tag_numbers.sh b/e2e_test_support_files/extract_tag_numbers.sh
index 04928bf5e..6e088061f 100644
--- a/e2e_test_support_files/extract_tag_numbers.sh
+++ b/e2e_test_support_files/extract_tag_numbers.sh
@@ -6,7 +6,7 @@ get_repository_tag() {
   local repo_name="$2"
   local app="$3"
   local value
-  value=$(grep "\"$app\":" "$file" | awk -F'"' '{print $4}')
+  value=$(awk -F'"' "/${app/\//\/}/ {print \$4}" "$file")
   echo "$repo_name=$value"
 }