diff --git a/.github/workflows/production-build.yaml b/.github/workflows/production-build.yaml
index 09e163fce..066b45350 100644
--- a/.github/workflows/production-build.yaml
+++ b/.github/workflows/production-build.yaml
@@ -5,7 +5,7 @@ on:
     types:
       - created
 
-run-name: "[${{ github.event.release.tag_name }}] Docker Image Build and Push (Development)"
+run-name: "[${{ github.event.release.tag_name }}] Docker Image Build and Push (Production)"
 
 jobs:
   build-and-push:
@@ -26,8 +26,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push image
+      - name: Build and push images
         working-directory: ./docker
         run: |
           VERSION=${{ github.event.release.tag_name }} docker-compose -f docker-compose.build.yaml build --no-cache ${{ matrix.service_name }}
+          docker tag unstract/${{ matrix.service_name }}:${{ github.event.release.tag_name }} unstract/${{ matrix.service_name }}:latest
           docker push unstract/${{ matrix.service_name }}:${{ github.event.release.tag_name }}
+          docker push unstract/${{ matrix.service_name }}:latest
diff --git a/docker/dockerfiles/prompt.Dockerfile b/docker/dockerfiles/prompt.Dockerfile
index d9ede2eb8..826b5296b 100644
--- a/docker/dockerfiles/prompt.Dockerfile
+++ b/docker/dockerfiles/prompt.Dockerfile
@@ -25,6 +25,8 @@ RUN apt-get update; \
     # For more info, please refer to https://aka.ms/vscode-docker-python-configure-containers
     adduser -u 5678 --disabled-password --gecos "" --home /app unstract;
 
+USER unstract
+
 WORKDIR /app
 
 COPY ${BUILD_CONTEXT_PATH} .