diff --git a/compose-builder/add-device-onvif-camera.yml b/compose-builder/add-device-onvif-camera.yml
index 078c638..a1635fb 100644
--- a/compose-builder/add-device-onvif-camera.yml
+++ b/compose-builder/add-device-onvif-camera.yml
@@ -30,6 +30,7 @@ services:
       - common-non-security.env
     environment:
       SERVICE_HOST: edgex-device-onvif-camera
+      MESSAGEBUS_HOST: edgex-mqtt-broker
     depends_on:
       - core-keeper
       - core-data
diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml
index e9311a6..ca280ee 100644
--- a/docker-compose-arm64.yml
+++ b/docker-compose-arm64.yml
@@ -890,7 +890,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -914,7 +914,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml
index ec0ff75..6bd2b70 100644
--- a/docker-compose-with-app-sample-arm64.yml
+++ b/docker-compose-with-app-sample-arm64.yml
@@ -967,7 +967,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -991,7 +991,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml
index 543e6d1..17afea6 100644
--- a/docker-compose-with-app-sample.yml
+++ b/docker-compose-with-app-sample.yml
@@ -967,7 +967,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -991,7 +991,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/docker-compose-zero-trust-arm64.yml b/docker-compose-zero-trust-arm64.yml
index 5f02a4a..ae7055c 100644
--- a/docker-compose-zero-trust-arm64.yml
+++ b/docker-compose-zero-trust-arm64.yml
@@ -810,7 +810,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -834,7 +834,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/docker-compose-zero-trust.yml b/docker-compose-zero-trust.yml
index 6ea1642..407ef32 100644
--- a/docker-compose-zero-trust.yml
+++ b/docker-compose-zero-trust.yml
@@ -810,7 +810,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -834,7 +834,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index f8d00fa..c799d58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -890,7 +890,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -914,7 +914,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml
index fd4843c..b195515 100644
--- a/taf/docker-compose-taf-arm64.yml
+++ b/taf/docker-compose-taf-arm64.yml
@@ -1124,6 +1124,7 @@ services:
       - /edgex-init/ready_to_run_wait_install.sh
     environment:
       EDGEX_SECURITY_SECRET_STORE: "true"
+      MESSAGEBUS_HOST: edgex-mqtt-broker
       PROXY_SETUP_HOST: edgex-security-proxy-setup
       SECRETSTORE_HOST: edgex-secret-store
       SERVICE_HOST: edgex-device-onvif-camera
@@ -1617,7 +1618,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -1641,7 +1642,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/taf/docker-compose-taf-no-secty-arm64.yml b/taf/docker-compose-taf-no-secty-arm64.yml
index f2d4977..7c14dd7 100644
--- a/taf/docker-compose-taf-no-secty-arm64.yml
+++ b/taf/docker-compose-taf-no-secty-arm64.yml
@@ -630,6 +630,7 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
+      MESSAGEBUS_HOST: edgex-mqtt-broker
       SERVICE_HOST: edgex-device-onvif-camera
     hostname: edgex-device-onvif-camera
     image: nexus3.edgexfoundry.org:10004/device-onvif-camera-arm64:latest
diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml
index e2f3193..89a7f72 100644
--- a/taf/docker-compose-taf-no-secty.yml
+++ b/taf/docker-compose-taf-no-secty.yml
@@ -630,6 +630,7 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
+      MESSAGEBUS_HOST: edgex-mqtt-broker
       SERVICE_HOST: edgex-device-onvif-camera
     hostname: edgex-device-onvif-camera
     image: nexus3.edgexfoundry.org:10004/device-onvif-camera:latest
diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml
index 8fe8bdd..cb15724 100644
--- a/taf/docker-compose-taf-perf-arm64.yml
+++ b/taf/docker-compose-taf-perf-arm64.yml
@@ -988,7 +988,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -1012,7 +1012,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml
index 18e1a99..3a5a181 100644
--- a/taf/docker-compose-taf-perf.yml
+++ b/taf/docker-compose-taf-perf.yml
@@ -988,7 +988,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -1012,7 +1012,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports:
diff --git a/taf/docker-compose-taf.yml b/taf/docker-compose-taf.yml
index 3b5475e..a0085cb 100644
--- a/taf/docker-compose-taf.yml
+++ b/taf/docker-compose-taf.yml
@@ -1124,6 +1124,7 @@ services:
       - /edgex-init/ready_to_run_wait_install.sh
     environment:
       EDGEX_SECURITY_SECRET_STORE: "true"
+      MESSAGEBUS_HOST: edgex-mqtt-broker
       PROXY_SETUP_HOST: edgex-security-proxy-setup
       SECRETSTORE_HOST: edgex-secret-store
       SERVICE_HOST: edgex-device-onvif-camera
@@ -1617,7 +1618,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "6353435230208"
+          memory: "4190239719424"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -1641,7 +1642,7 @@ services:
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
     image: openbao/openbao:2.1
-    memswap_limit: "6353435230208"
+    memswap_limit: "4190239719424"
     networks:
       edgex-network: null
     ports: