diff --git a/salt/elastalert/enabled.sls b/salt/elastalert/enabled.sls
index 3ccc6ed1d..9e15bb744 100644
--- a/salt/elastalert/enabled.sls
+++ b/salt/elastalert/enabled.sls
@@ -51,9 +51,9 @@ so-elastalert:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-elastalert'].ulimits %}
+    {% if DOCKERMERGED.containers['so-elastalert'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-elastalert'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-elastalert'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/elastic-fleet-package-registry/enabled.sls b/salt/elastic-fleet-package-registry/enabled.sls
index aee7a3348..67b47fd1b 100644
--- a/salt/elastic-fleet-package-registry/enabled.sls
+++ b/salt/elastic-fleet-package-registry/enabled.sls
@@ -45,9 +45,9 @@ so-elastic-fleet-package-registry:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-elastic-fleet-package-registry'].ulimits %}
+    {% if DOCKERMERGED.containers['so-elastic-fleet-package-registry'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-elastic-fleet-package-registry'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-fleet-package-registry'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/elasticagent/enabled.sls b/salt/elasticagent/enabled.sls
index 419e19217..02a329a23 100644
--- a/salt/elasticagent/enabled.sls
+++ b/salt/elasticagent/enabled.sls
@@ -54,9 +54,9 @@ so-elastic-agent:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-elastic-agent'].ulimits %}
+    {% if DOCKERMERGED.containers['so-elastic-agent'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-elastic-agent'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-agent'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls
index 604bb7e4e..a23242d10 100644
--- a/salt/elasticfleet/enabled.sls
+++ b/salt/elasticfleet/enabled.sls
@@ -133,9 +133,9 @@ so-elastic-fleet:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-elastic-fleet'].ulimits %}
+    {% if DOCKERMERGED.containers['so-elastic-fleet'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-elastic-fleet'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-elastic-fleet'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/elasticsearch/enabled.sls b/salt/elasticsearch/enabled.sls
index 64f45fa58..3fe31a3c4 100644
--- a/salt/elasticsearch/enabled.sls
+++ b/salt/elasticsearch/enabled.sls
@@ -45,14 +45,14 @@ so-elasticsearch:
       - discovery.type=single-node
       {% endif %}
       - ES_JAVA_OPTS=-Xms{{ GLOBALS.elasticsearch.es_heap }} -Xmx{{ GLOBALS.elasticsearch.es_heap }} -Des.transport.cname_in_publish_address=true -Dlog4j2.formatMsgNoLookups=true
-      {% if DOCKER.containers['so-elasticsearch'].extra_env %}
-        {% for XTRAENV in DOCKER.containers['so-elasticsearch'].extra_env %}
+      {% if DOCKERMERGED.containers['so-elasticsearch'].extra_env %}
+        {% for XTRAENV in DOCKERMERGED.containers['so-elasticsearch'].extra_env %}
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-elasticsearch'].ulimits %}
+    {% if DOCKERMERGED.containers['so-elasticsearch'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-elasticsearch'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-elasticsearch'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/hydra/enabled.sls b/salt/hydra/enabled.sls
index 38982448c..c79703000 100644
--- a/salt/hydra/enabled.sls
+++ b/salt/hydra/enabled.sls
@@ -52,9 +52,9 @@ so-hydra:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-hydra'].ulimits %}
+    {% if DOCKERMERGED.containers['so-hydra'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-hydra'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-hydra'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/idh/enabled.sls b/salt/idh/enabled.sls
index bb9af1998..440d9dc2e 100644
--- a/salt/idh/enabled.sls
+++ b/salt/idh/enabled.sls
@@ -39,9 +39,9 @@ so-idh:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-idh'].ulimits %}
+    {% if DOCKERMERGED.containers['so-idh'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-idh'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-idh'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/influxdb/enabled.sls b/salt/influxdb/enabled.sls
index 4d0ceb41f..463064ac9 100644
--- a/salt/influxdb/enabled.sls
+++ b/salt/influxdb/enabled.sls
@@ -58,9 +58,9 @@ so-influxdb:
       - {{ XTRAHOST }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-influxdb'].ulimits %}
+    {% if DOCKERMERGED.containers['so-influxdb'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-influxdb'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-influxdb'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/kafka/enabled.sls b/salt/kafka/enabled.sls
index e79ded0eb..f9a31510b 100644
--- a/salt/kafka/enabled.sls
+++ b/salt/kafka/enabled.sls
@@ -60,9 +60,9 @@ so-kafka:
       {% if KAFKA_EXTERNAL_ACCESS %}
       - /opt/so/conf/kafka/kafka_server_jaas.conf:/opt/kafka/config/kafka_server_jaas.conf:ro
       {% endif %}
-    {% if DOCKER.containers['so-kafka'].ulimits %}
+    {% if DOCKERMERGED.containers['so-kafka'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-kafka'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-kafka'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/kibana/enabled.sls b/salt/kibana/enabled.sls
index e24f45a68..880f7e7b3 100644
--- a/salt/kibana/enabled.sls
+++ b/salt/kibana/enabled.sls
@@ -51,9 +51,9 @@ so-kibana:
       {% for BINDING in DOCKERMERGED.containers['so-kibana'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
-    {% if DOCKER.containers['so-kibana'].ulimits %}
+    {% if DOCKERMERGED.containers['so-kibana'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-kibana'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-kibana'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/kratos/enabled.sls b/salt/kratos/enabled.sls
index 072445410..836680401 100644
--- a/salt/kratos/enabled.sls
+++ b/salt/kratos/enabled.sls
@@ -45,9 +45,9 @@ so-kratos:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-kratos'].ulimits %}
+    {% if DOCKERMERGED.containers['so-kratos'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-kratos'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-kratos'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/logstash/enabled.sls b/salt/logstash/enabled.sls
index 207f8d3c8..f01578270 100644
--- a/salt/logstash/enabled.sls
+++ b/salt/logstash/enabled.sls
@@ -96,9 +96,9 @@ so-logstash:
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-logstash'].ulimits %}
+    {% if DOCKERMERGED.containers['so-logstash'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-logstash'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-logstash'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/nginx/enabled.sls b/salt/nginx/enabled.sls
index 14fad1180..8b8bba66f 100644
--- a/salt/nginx/enabled.sls
+++ b/salt/nginx/enabled.sls
@@ -75,9 +75,9 @@ so-nginx:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers[container_config].ulimits %}
+    {% if DOCKERMERGED.containers[container_config].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers[container_config].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers[container_config].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/redis/enabled.sls b/salt/redis/enabled.sls
index d5b918225..2db78bf24 100644
--- a/salt/redis/enabled.sls
+++ b/salt/redis/enabled.sls
@@ -51,9 +51,9 @@ so-redis:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-redis'].ulimits %}
+    {% if DOCKERMERGED.containers['so-redis'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-redis'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-redis'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/registry/enabled.sls b/salt/registry/enabled.sls
index 3601e2ed0..54ce80942 100644
--- a/salt/registry/enabled.sls
+++ b/salt/registry/enabled.sls
@@ -51,9 +51,9 @@ so-dockerregistry:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-dockerregistry'].ulimits %}
+    {% if DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-dockerregistry'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-dockerregistry'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/sensoroni/enabled.sls b/salt/sensoroni/enabled.sls
index 86cd42998..20b049e06 100644
--- a/salt/sensoroni/enabled.sls
+++ b/salt/sensoroni/enabled.sls
@@ -40,9 +40,9 @@ so-sensoroni:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-sensoroni'].ulimits %}
+    {% if DOCKERMERGED.containers['so-sensoroni'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-sensoroni'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-sensoroni'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/soc/enabled.sls b/salt/soc/enabled.sls
index a98ebc359..8d2f88028 100644
--- a/salt/soc/enabled.sls
+++ b/salt/soc/enabled.sls
@@ -78,9 +78,9 @@ so-soc:
       - {{ XTRAENV }}
     {%   endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-soc'].ulimits %}
+    {% if DOCKERMERGED.containers['so-soc'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-soc'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-soc'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/backend/enabled.sls b/salt/strelka/backend/enabled.sls
index bdce96146..59d7e8b02 100644
--- a/salt/strelka/backend/enabled.sls
+++ b/salt/strelka/backend/enabled.sls
@@ -41,9 +41,9 @@ strelka_backend:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-strelka-backend'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-backend'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-backend'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-backend'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/coordinator/enabled.sls b/salt/strelka/coordinator/enabled.sls
index c6bccd93a..7b1485714 100644
--- a/salt/strelka/coordinator/enabled.sls
+++ b/salt/strelka/coordinator/enabled.sls
@@ -44,9 +44,9 @@ strelka_coordinator:
       - {{ BIND }}
         {% endfor %}
       {% endif %}
-    {% if DOCKER.containers['so-strelka-coordinator'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-coordinator'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-coordinator'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-coordinator'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/filestream/enabled.sls b/salt/strelka/filestream/enabled.sls
index 93855ed7f..73986cd3e 100644
--- a/salt/strelka/filestream/enabled.sls
+++ b/salt/strelka/filestream/enabled.sls
@@ -41,9 +41,9 @@ strelka_filestream:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-strelka-filestream'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-filestream'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-filestream'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-filestream'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/frontend/enabled.sls b/salt/strelka/frontend/enabled.sls
index 8ab13b69e..fae84a521 100644
--- a/salt/strelka/frontend/enabled.sls
+++ b/salt/strelka/frontend/enabled.sls
@@ -46,9 +46,9 @@ strelka_frontend:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-strelka-frontend'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-frontend'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-frontend'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-frontend'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/gatekeeper/enabled.sls b/salt/strelka/gatekeeper/enabled.sls
index bc7433874..783926cf9 100644
--- a/salt/strelka/gatekeeper/enabled.sls
+++ b/salt/strelka/gatekeeper/enabled.sls
@@ -44,9 +44,9 @@ strelka_gatekeeper:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-strelka-gatekeeper'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-gatekeeper'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-gatekeeper'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-gatekeeper'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/strelka/manager/enabled.sls b/salt/strelka/manager/enabled.sls
index f57241007..029ac7085 100644
--- a/salt/strelka/manager/enabled.sls
+++ b/salt/strelka/manager/enabled.sls
@@ -40,9 +40,9 @@ strelka_manager:
       - {{ XTRAENV }}
       {% endfor %}
     {% endif %}
-    {% if DOCKER.containers['so-strelka-manager'].ulimits %}
+    {% if DOCKERMERGED.containers['so-strelka-manager'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-strelka-manager'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-strelka-manager'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}
diff --git a/salt/zeek/enabled.sls b/salt/zeek/enabled.sls
index 8a7a3580d..8c8b755dd 100644
--- a/salt/zeek/enabled.sls
+++ b/salt/zeek/enabled.sls
@@ -18,9 +18,9 @@ so-zeek:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-zeek:{{ GLOBALS.so_version }}
     - start: True
     - privileged: True
-    {% if DOCKER.containers['so-zeek'].ulimits %}
+    {% if DOCKERMERGED.containers['so-zeek'].ulimits %}
     - ulimits:
-    {%   for ULIMIT in DOCKER.containers['so-zeek'].ulimits %}
+    {%   for ULIMIT in DOCKERMERGED.containers['so-zeek'].ulimits %}
       - {{ ULIMIT }}
     {%   endfor %}
     {% endif %}