diff --git a/.github/workflows/alpha-publish.yml b/.github/workflows/alpha-publish.yml
index 4204396e6..2c860f4a6 100644
--- a/.github/workflows/alpha-publish.yml
+++ b/.github/workflows/alpha-publish.yml
@@ -1,4 +1,4 @@
-name: Publish Alpha
+name: Build and Publish Alpha
 
 on:
   workflow_dispatch:
@@ -34,7 +34,7 @@ jobs:
           username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
-      - name: Build and push preprod image
+      - name: Build and push alpha image
         uses: docker/build-push-action@v6.18.0
         with:
           context: .
diff --git a/.github/workflows/preprod-publish.yml b/.github/workflows/preprod-publish.yml
index 9660ed6b9..39c6271d6 100644
--- a/.github/workflows/preprod-publish.yml
+++ b/.github/workflows/preprod-publish.yml
@@ -1,4 +1,4 @@
-name: Publish Preprod
+name: Build and Publish Preprod
 
 on:
   workflow_dispatch:
@@ -33,21 +33,11 @@ jobs:
         with:
           ref: ${{ github.event.inputs.branch }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.6.0
-        with:
-          registry: ${{ secrets.DOCKER_REGISTRY_URL }}
-          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
-          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
-
       - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v5.8.0
         with:
-          images: ${{ secrets.DOCKER_REGISTRY_URL }}/hyperion
+          images: ${{ secrets.DOCKER_REGISTRY_IDENTIFER }}/hyperion
           tags: |
             type=raw,value=${{ github.event.inputs.preprod_env }}
             type=raw,value=preprod-latest,enable={{is_default_branch}}
@@ -56,6 +46,16 @@ jobs:
             preprod.environment=${{ github.event.inputs.preprod_env }}
             preprod.branch=${{ github.event.inputs.branch }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.11.1
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3.6.0
+        with:
+          registry: ${{ secrets.DOCKER_REGISTRY_URL }}
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
       - name: Build and push preprod image
         uses: docker/build-push-action@v6.18.0
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 22c46cd29..a51ca8163 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Build and Publish Hyperion Docker Images
+name: Build and Publish Hyperion Prod Image
 on:
   workflow_dispatch:
   push:
@@ -6,7 +6,7 @@ on:
       - "v*.*.*"
 
 jobs:
-  docker:
+  build-and-deploy-prod:
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
diff --git a/Dockerfile b/Dockerfile
index e89decef9..2e0f70880 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ ENV PYTHONUNBUFFERED=1
 ENV UV_COMPILE_BYTECODE=1
 
 # Create non-root user early for better security
-RUN groupadd --gid 1000 hyperion && \
-    useradd --uid 1000 --gid hyperion --shell /bin/bash --create-home hyperion
+RUN groupadd --gid 10101 hyperion && \
+    useradd --uid 10101 --gid hyperion --shell /bin/bash --create-home hyperion
 
 WORKDIR /hyperion