diff --git a/cli/Dockerfile b/cli/Dockerfile
index e865daa0..a524420a 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:20@sha256:ac32b3e93f843470c7f55b7d694df016def3d02d55de83e2f43d432a8884b3a4
+FROM eclipse-temurin:11-jre-focal@sha256:4c1ab549795f20b661bfaaa22716e5e10a8eae66a534e668a1e028683c810efa
 
 ARG APP_NAME
 ARG APP_VERSION
@@ -6,9 +6,6 @@ ENV VERSION=$APP_VERSION
 
 LABEL org.opencontainers.image.source=https://github.com/specmesh/specmesh-build/tree/main/cli
 
-RUN yum update -y
-RUN yum install -y tar lsof
-
 RUN mkdir -p /opt/specmesh
 
 COPY bin /bin
@@ -16,13 +13,10 @@ COPY log4j /log
 
 RUN chmod +x /bin/*.sh
 
-COPY ${APP_NAME}-${APP_VERSION}.tar /opt/specmesh
+COPY ${APP_NAME}-${APP_VERSION} /opt/specmesh/${APP_NAME}-${APP_VERSION}
 WORKDIR /opt/specmesh
 
-RUN tar xf ${APP_NAME}-${APP_VERSION}.tar
 RUN ln -s ${APP_NAME}-${APP_VERSION} service
 
-
-
 ENTRYPOINT ["/bin/wrapper.sh"]
 #No CMD instruction is provided, allowing you to pass any number of arguments at runtime.
\ No newline at end of file
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index bb03a1d8..6d4e8d1d 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -67,7 +67,7 @@ tasks.register<Copy>("prepareDocker") {
 
     from(
         layout.projectDirectory.file("Dockerfile"),
-        layout.buildDirectory.file("distributions/${project.name}-${project.version}.tar"),
+        tarTree(layout.buildDirectory.file("distributions/${project.name}-${project.version}.tar")),
         layout.projectDirectory.dir("include"),
     )