diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java
index e2ddeb8c..384832e1 100644
--- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java
+++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java
@@ -34,10 +34,10 @@ public class DeploymentExecutor {
     @Value("${cameleer.server.runtime.dockernetwork:cameleer}")
     private String dockerNetwork;
 
-    @Value("${cameleer.server.runtime.containermemorylimit:512m}")
+    @Value("${cameleer.server.runtime.container.memorylimit:512m}")
     private String globalMemoryLimit;
 
-    @Value("${cameleer.server.runtime.containercpushares:512}")
+    @Value("${cameleer.server.runtime.container.cpushares:512}")
     private int globalCpuShares;
 
     @Value("${cameleer.server.runtime.healthchecktimeout:60}")
diff --git a/cameleer3-server-app/src/main/resources/application.yml b/cameleer3-server-app/src/main/resources/application.yml
index 8d10f7b0..e374cfe0 100644
--- a/cameleer3-server-app/src/main/resources/application.yml
+++ b/cameleer3-server-app/src/main/resources/application.yml
@@ -47,8 +47,9 @@ cameleer:
       dockernetwork: ${CAMELEER_SERVER_RUNTIME_DOCKERNETWORK:cameleer}
       agenthealthport: 9464
       healthchecktimeout: 60
-      containermemorylimit: ${CAMELEER_SERVER_RUNTIME_CONTAINERMEMORYLIMIT:512m}
-      containercpushares: ${CAMELEER_SERVER_RUNTIME_CONTAINERCPUSHARES:512}
+      container:
+        memorylimit: ${CAMELEER_SERVER_RUNTIME_CONTAINER_MEMORYLIMIT:512m}
+        cpushares: ${CAMELEER_SERVER_RUNTIME_CONTAINER_CPUSHARES:512}
       routingmode: ${CAMELEER_SERVER_RUNTIME_ROUTINGMODE:path}
       routingdomain: ${CAMELEER_SERVER_RUNTIME_ROUTINGDOMAIN:localhost}
       serverurl: ${CAMELEER_SERVER_RUNTIME_SERVERURL:}