diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 7397b2033..8243e657f 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -1,6 +1,6 @@
 ######################################################
 ## Build
-FROM eclipse-temurin:21 as build
+FROM eclipse-temurin:21-jammy as build
 
 # BUILDS FOR ADOPTIUM, NOT ADOPTOPENJDK
 ARG MAVEN_FLAGS="-Padoptium,-adoptopenjdk"
@@ -12,48 +12,33 @@ ENV REPOSITORY=$REPOSITORY
 ARG BRANCH="main"
 ENV BRANCH=$BRANCH
 
-RUN     apt-get update && apt-get -y install openssl adduser && \
-        useradd -ms /bin/bash api && \
-        mkdir -p /home/api/deployment/ && \
-        mkdir -p /home/api/deployment/lib && \
-        mkdir /tmp/build && \
-        chown -R api: /home/api/
+RUN     mkdir /tmp/build
 
 WORKDIR /tmp/build
 
 COPY . /tmp/build
 
-RUN chown -R api: /tmp/build
-
-USER api
-
 RUN     ./mvnw clean install $MAVEN_FLAGS && \
-        cp adoptium-updater-parent/adoptium-api-v3-updater/target/adoptium-api-v3-updater-*-jar-with-dependencies.jar /home/api/deployment/updater.jar && \
-        cp -r adoptium-frontend-parent/adoptium-api-v3-frontend/target/quarkus-app/* /home/api/deployment/ && \
-        mv /home/api/deployment/quarkus-run.jar /home/api/deployment/frontend.jar && \
-        cp deploy/run.sh /home/api/deployment/ && \
-        chmod +x /home/api/deployment/run.sh && \
+        mkdir -p /api/deployment && \
+        cp adoptium-updater-parent/adoptium-api-v3-updater/target/adoptium-api-v3-updater-*-jar-with-dependencies.jar /api/deployment/updater.jar && \
+        cp -r adoptium-frontend-parent/adoptium-api-v3-frontend/target/quarkus-app/* /api/deployment/ && \
+        mv /api/deployment/quarkus-run.jar /api/deployment/frontend.jar && \
+        cp deploy/run.sh /api/deployment/ && \
+        chmod +x /api/deployment/run.sh && \
         cd /tmp && \
         rm -rf /tmp/build ~/.m2 && \
-        cd /home/api/ && find
+        cd /api/ && find
 
 
 ######################################################
 ## Build Deployment
-FROM eclipse-temurin:21
+FROM eclipse-temurin:21-jammy
 
 RUN     apt-get update && apt-get -y install openssl adduser && \
         useradd -ms /bin/bash api && \
-        mkdir -p /home/api/ && \
         mkdir -p /logs
 
-COPY --from=build /home/api/deployment /home/api/deployment
-
-RUN chown -R api: /home/api/ && \
-    chmod -R ug+r /home/api/ && \
-    chmod u+rwx /home/api/ && \
-    chmod u+rwx /home/api/deployment && \
-    find /home/api/
+COPY --chown=api:api --from=build /api/deployment /home/api/deployment
 
 USER api