diff --git a/packs/gradle/Dockerfile b/packs/gradle/Dockerfile
index 9167dbc..930d976 100644
--- a/packs/gradle/Dockerfile
+++ b/packs/gradle/Dockerfile
@@ -3,4 +3,4 @@ ENV PORT 8080
 EXPOSE 8080
 COPY build/libs/*.jar /opt/app.jar
 WORKDIR /opt
-CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
+ENTRYPOINT exec java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap $JAVA_OPTS -jar app.jar
diff --git a/packs/gradle/charts/values.yaml b/packs/gradle/charts/values.yaml
index e38b17b..5d7f02c 100644
--- a/packs/gradle/charts/values.yaml
+++ b/packs/gradle/charts/values.yaml
@@ -16,10 +16,10 @@ service:
     fabric8.io/ingress.annotations: "kubernetes.io/ingress.class: nginx"
 resources:
   limits:
-    cpu: 500m
-    memory: 512Mi
+    cpu: 1800m
+    memory: 768Mi
   requests:
-    cpu: 400m
+    cpu: 600m
     memory: 512Mi
 probePath: /actuator/health
 livenessProbe:
diff --git a/packs/maven/Dockerfile b/packs/maven/Dockerfile
index d008962..bb62253 100644
--- a/packs/maven/Dockerfile
+++ b/packs/maven/Dockerfile
@@ -11,4 +11,5 @@ COPY pom.xml target/lib* /opt/lib/
 # we could do with a better way to know the name - or to always create an app.jar or something
 COPY target/*.jar /opt/app.jar
 WORKDIR /opt
-CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
+
+ENTRYPOINT exec java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap $JAVA_OPTS -jar app.jar
diff --git a/packs/maven/charts/values.yaml b/packs/maven/charts/values.yaml
index 807cb35..bd9972e 100644
--- a/packs/maven/charts/values.yaml
+++ b/packs/maven/charts/values.yaml
@@ -16,10 +16,10 @@ service:
     fabric8.io/ingress.annotations: "kubernetes.io/ingress.class: nginx"
 resources:
   limits:
-    cpu: 500m
-    memory: 512Mi
+    cpu: 1800m
+    memory: 768Mi
   requests:
-    cpu: 400m
+    cpu: 600m
     memory: 512Mi
 probePath: /actuator/health
 livenessProbe: