diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 296dda225..f25ab4f58 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -24,6 +24,7 @@ jobs:
       contents: read
       packages: write
     strategy:
+      fail-fast: false
       matrix:
         include:
           - type: standard
@@ -91,12 +92,15 @@ jobs:
               GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION$SUFFIX"
               GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}.${MINOR}$SUFFIX"
               GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}$SUFFIX"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest$SUFFIX"
-          
+
               DOCKER_TAGS="umamisoftware/umami:$VERSION$SUFFIX"
               DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}.${MINOR}$SUFFIX"
               DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}$SUFFIX"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest$SUFFIX"
+
+              if [[ -z "$SUFFIX" ]]; then
+                GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest"
+                DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest"
+              fi
           
               # Add latest tag based on trigger and input
               if [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then
diff --git a/Dockerfile b/Dockerfile
index a193f143b..29eddec96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,7 @@ COPY docker/middleware.ts ./src
 ARG BASE_PATH=""
 
 ENV BASE_PATH=$BASE_PATH
+LABEL org.opencontainers.image.base-path="$BASE_PATH"
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV DATABASE_URL="postgresql://user:pass@localhost:5432/dummy"
 
@@ -30,12 +31,10 @@ WORKDIR /app
 
 ARG PRISMA_VERSION="6.19.0"
 ARG NODE_OPTIONS
-ARG BASE_PATH=""
 
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_OPTIONS=$NODE_OPTIONS
-ENV BASE_PATH=$BASE_PATH
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs