diff --git a/opensearch-coord1/config.json b/opensearch-coord1/config.json
index fc29683..3a5e215 100644
--- a/opensearch-coord1/config.json
+++ b/opensearch-coord1/config.json
@@ -69,9 +69,5 @@
   "ports": {
     "9203/tcp": 9203,
     "9303/tcp": 9303
-  },
-  "environment": {
-    "OPENSEARCH_JAVA_OPTS": "-Xms${options[opensearch_heap]} -Xmx${options[opensearch_heap]}",
-    "OPENSEARCH_INITIAL_ADMIN_PASSWORD": "MyOpenSearch25!!"
   }
 }
\ No newline at end of file
diff --git a/opensearch-coord1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-coord1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index e0e3fc2..6ab510e 100644
--- a/opensearch-coord1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-coord1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -18,7 +18,13 @@ if [ -f "$OPTIONS_FILE" ]; then
   NODE_ROLES=$(jq -r '.node_roles // ["coordinating_only"] | join(",")' "$OPTIONS_FILE" 2>/dev/null || echo "coordinating_only")
 fi
 
-export OPENSEARCH_JAVA_OPTS="-Xms$2g -Xmx$2g"
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+opensearch_heap=$(bashio::config 'opensearch_heap')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
 echo "[s6-run] Starting OpenSearch node: $os-coord-1 roles:$coordinating_only heap:$2g http:$9203 transport:$9303"
 
diff --git a/opensearch-coord2/config.json b/opensearch-coord2/config.json
index a18c264..6e3cd11 100644
--- a/opensearch-coord2/config.json
+++ b/opensearch-coord2/config.json
@@ -69,9 +69,5 @@
   "ports": {
     "9204/tcp": 9204,
     "9304/tcp": 9304
-  },
-  "environment": {
-    "OPENSEARCH_JAVA_OPTS": "-Xms${options[opensearch_heap]} -Xmx${options[opensearch_heap]}",
-    "OPENSEARCH_INITIAL_ADMIN_PASSWORD": "MyOpenSearch25!!"
   }
 }
\ No newline at end of file
diff --git a/opensearch-coord2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-coord2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index 8eaab58..e8d5890 100644
--- a/opensearch-coord2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-coord2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -18,7 +18,13 @@ if [ -f "$OPTIONS_FILE" ]; then
   NODE_ROLES=$(jq -r '.node_roles // ["coordinating_only"] | join(",")' "$OPTIONS_FILE" 2>/dev/null || echo "coordinating_only")
 fi
 
-export OPENSEARCH_JAVA_OPTS="-Xms$2g -Xmx$2g"
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+opensearch_heap=$(bashio::config 'opensearch_heap')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
 echo "[s6-run] Starting OpenSearch node: $os-coord-2 roles:$coordinating_only heap:$2g http:$9204 transport:$9304"
 
diff --git a/opensearch-data1/config.json b/opensearch-data1/config.json
index 536634f..ee2ad5b 100644
--- a/opensearch-data1/config.json
+++ b/opensearch-data1/config.json
@@ -70,9 +70,5 @@
   "ports": {
     "9201/tcp": 9201,
     "9301/tcp": 9301
-  },
-  "environment": {
-    "OPENSEARCH_JAVA_OPTS": "-Xms${options[opensearch_heap]} -Xmx${options[opensearch_heap]}",
-    "OPENSEARCH_INITIAL_ADMIN_PASSWORD": "MyOpenSearch25!!"
   }
 }
\ No newline at end of file
diff --git a/opensearch-data1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-data1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index feafcb3..30ab2b7 100644
--- a/opensearch-data1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-data1/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -18,7 +18,13 @@ if [ -f "$OPTIONS_FILE" ]; then
   NODE_ROLES=$(jq -r '.node_roles // ["data,ingest"] | join(",")' "$OPTIONS_FILE" 2>/dev/null || echo "data,ingest")
 fi
 
-export OPENSEARCH_JAVA_OPTS="-Xms$5g -Xmx$5g"
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+opensearch_heap=$(bashio::config 'opensearch_heap')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
 echo "[s6-run] Starting OpenSearch node: $os-data-1 roles:$data,ingest heap:$5g http:$9201 transport:$9301"
 
diff --git a/opensearch-data2/config.json b/opensearch-data2/config.json
index 09b4e41..77f3b49 100644
--- a/opensearch-data2/config.json
+++ b/opensearch-data2/config.json
@@ -70,9 +70,5 @@
   "ports": {
     "9202/tcp": 9202,
     "9302/tcp": 9302
-  },
-  "environment": {
-    "OPENSEARCH_JAVA_OPTS": "-Xms${options[opensearch_heap]} -Xmx${options[opensearch_heap]}",
-    "OPENSEARCH_INITIAL_ADMIN_PASSWORD": "MyOpenSearch25!!"
   }
 }
\ No newline at end of file
diff --git a/opensearch-data2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-data2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index cf6316b..62e2abf 100644
--- a/opensearch-data2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-data2/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -18,7 +18,13 @@ if [ -f "$OPTIONS_FILE" ]; then
   NODE_ROLES=$(jq -r '.node_roles // ["data,ingest"] | join(",")' "$OPTIONS_FILE" 2>/dev/null || echo "data,ingest")
 fi
 
-export OPENSEARCH_JAVA_OPTS="-Xms$5g -Xmx$5g"
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+opensearch_heap=$(bashio::config 'opensearch_heap')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
 echo "[s6-run] Starting OpenSearch node: $os-data-2 roles:$data,ingest heap:$5g http:$9202 transport:$9302"
 
diff --git a/opensearch-master/config.json b/opensearch-master/config.json
index e7a7db6..5b0a183 100644
--- a/opensearch-master/config.json
+++ b/opensearch-master/config.json
@@ -69,9 +69,5 @@
   "ports": {
     "9200/tcp": 9200,
     "9300/tcp": 9300
-  },
-  "environment": {
-    "OPENSEARCH_JAVA_OPTS": "-Xms${options[opensearch_heap]} -Xmx${options[opensearch_heap]}",
-    "OPENSEARCH_INITIAL_ADMIN_PASSWORD": "MyOpenSearch25!!"
   }
 }
\ No newline at end of file
diff --git a/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index 425fd11..385773c 100644
--- a/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -18,7 +18,13 @@ if [ -f "$OPTIONS_FILE" ]; then
   NODE_ROLES=$(jq -r '.node_roles // ["master"] | join(",")' "$OPTIONS_FILE" 2>/dev/null || echo "master")
 fi
 
-export OPENSEARCH_JAVA_OPTS="-Xms$1.5g -Xmx$1.5g"
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+opensearch_heap=$(bashio::config 'opensearch_heap')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
 echo "[s6-run] Starting OpenSearch node: $os-master roles:$master heap:$1.5g http:$9200 transport:$9300"