diff --git a/quarkus/admin/src/main/docker/Dockerfile.jvm b/quarkus/admin/src/main/docker/Dockerfile.jvm
index 8537fa5a4f..ffb679ce38 100644
--- a/quarkus/admin/src/main/docker/Dockerfile.jvm
+++ b/quarkus/admin/src/main/docker/Dockerfile.jvm
@@ -31,12 +31,15 @@ RUN groupadd --gid 10001 polaris \
       && chown -R polaris:polaris /deployments
 
 USER polaris
-WORKDIR /deployments
+WORKDIR /home/polaris
 ENV USER=polaris
 ENV UID=10000
 ENV HOME=/home/polaris
-ENV PWD=/deployments
 
-COPY --chown=polaris:polaris build/*-runner.jar /deployments/polaris-server-admin-tool.jar
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=polaris:polaris build/quarkus-app/lib/ /deployments/lib/
+COPY --chown=polaris:polaris build/quarkus-app/quarkus-run.jar /deployments/polaris-admin-tool.jar
+COPY --chown=polaris:polaris build/quarkus-app/app/ /deployments/app/
+COPY --chown=polaris:polaris build/quarkus-app/quarkus/ /deployments/quarkus/
 
-ENTRYPOINT [ "java", "-jar", "/deployments/polaris-server-admin-tool.jar" ]
\ No newline at end of file
+ENTRYPOINT [ "java", "-jar", "/deployments/polaris-admin-tool.jar" ]
\ No newline at end of file
diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java b/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
index e26aa49256..50725af502 100644
--- a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
+++ b/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
@@ -26,7 +26,7 @@
 
 @TopCommand
 @Command(
-    name = "polaris-quarkus-admin-runner.jar",
+    name = "polaris-admin-tool.jar",
     mixinStandardHelpOptions = true,
     versionProvider = PolarisVersionProvider.class,
     description = "Polaris Admin Tool",