diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 4a32d601c..edafca19c 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -41,5 +41,5 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ github.event.number }}
+          target: ${{ github.sha }}
           tags: test
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 751051781..752c3efbe 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -67,14 +67,6 @@ jobs:
           triggers: ('${{ matrix.triggers }}/')
           build_context: ${{ matrix.build_context }}
 
-      - name: Tag Docker Images
-        uses: shrink/actions-docker-registry-tag@v3
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ github.sha }}
-          tags: ${{ github.event.number }}
-
   # https://github.com/bcgov-nr/action-deployer-openshift
   deploys:
     name: Deploys
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 8a9bb1087..449329de3 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -21,5 +21,5 @@ RUN caddy fmt --overwrite /etc/caddy/Caddyfile
 
 # Ports, health check and non-root user
 EXPOSE 3000 3001
-HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost/:3001/health
+HEALTHCHECK CMD curl -f http://localhost/:3001/health
 USER 1001