diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fcaef6f9..f1c69ef7 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -13,12 +13,12 @@ jobs:
     strategy:
       matrix:
         include:
-          - image: 1337kavin/piped:latest,1337kavin/piped:openj9
+          - image: 1337kavin/piped:openj9
             dockerfile: ./Dockerfile.openj9.ci
-          - image: 1337kavin/piped:hotspot
+          - image: 1337kavin/piped:latest,1337kavin/piped:hotspot
             dockerfile: ./Dockerfile.ci
-          - image: 1337kavin/piped:graalvm-jvm
-            dockerfile: ./Dockerfile.graalvm-jvm.ci
+          # - image: 1337kavin/piped:graalvm-jvm
+          #   dockerfile: ./Dockerfile.graalvm-jvm.ci
     steps:
       - uses: actions/checkout@v3
       - name: Create Version File
diff --git a/Dockerfile b/Dockerfile
index aa7be7ef..bba2bc50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ COPY VERSION .
 
 EXPOSE 8080
 
-CMD ["java", "--enable-preview", "-jar", "/app/piped.jar"]
+CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on --enable-preview -jar /app/piped.jar
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 20d2cb7c..281b9973 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -8,4 +8,4 @@ COPY VERSION .
 
 EXPOSE 8080
 
-CMD ["java", "--enable-preview", "-jar", "/app/piped.jar"]
+CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on --enable-preview -jar /app/piped.jar