diff --git a/Makefile b/Makefile
index 5d8e6461272..ad1e7d8cf34 100644
--- a/Makefile
+++ b/Makefile
@@ -718,8 +718,8 @@ install-schema-es-v6:
 	curl -X PUT "http://127.0.0.1:9200/cadence-visibility-dev"
 
 install-schema-es-opensearch:
-	curl -X PUT "https://127.0.0.1:9200/_template/cadence-visibility-template" -H 'Content-Type: application/json' -d @./schema/elasticsearch/os2/visibility/index_template.json -u admin:admin --insecure
-	curl -X PUT "https://127.0.0.1:9200/cadence-visibility-dev" -u admin:admin --insecure
+	curl -X PUT "https://127.0.0.1:9200/_template/cadence-visibility-template" -H 'Content-Type: application/json' -d @./schema/elasticsearch/os2/visibility/index_template.json -u admin:DevTestInitial123! --insecure
+	curl -X PUT "https://127.0.0.1:9200/cadence-visibility-dev" -u admin:DevTestInitial123! --insecure
 
 start: bins
 	./cadence-server start
diff --git a/config/development_es_opensearch.yaml b/config/development_es_opensearch.yaml
index 9e7e202b030..0cfeaf4caf6 100644
--- a/config/development_es_opensearch.yaml
+++ b/config/development_es_opensearch.yaml
@@ -6,7 +6,7 @@ persistence:
         disableSniff: true
         version: "os2"
         username: "admin"
-        password: "admin"
+        password: "DevTestInitial123!"
         tls:
           enabled: true
         url:
diff --git a/docker/dev/cassandra-opensearch-kafka.yml b/docker/dev/cassandra-opensearch-kafka.yml
index 52542cdfb24..048a543f618 100644
--- a/docker/dev/cassandra-opensearch-kafka.yml
+++ b/docker/dev/cassandra-opensearch-kafka.yml
@@ -7,13 +7,27 @@ services:
     environment:
       - "MAX_HEAP_SIZE=256M"
       - "HEAP_NEWSIZE=128M"
-  elasticsearch:
-    image: opensearchproject/opensearch:1.3.6
-    ports:
-      - "9200:9200"
-      - "9600:9600"
+  opensearch:
+    image: opensearchproject/opensearch:2.13.0
     environment:
       - discovery.type=single-node
+      - OPENSEARCH_SECURITY_SSL_HTTP_ENABLED=false
+      - cluster.name=opensearch-cluster
+      - bootstrap.memory_lock=true
+      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=DevTestInitial123!    # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and later
+    ports:
+      - 9200:9200 # REST API
+      - 9600:9600 # Performance Analyzer
+  opensearch-dashboards:
+    image: opensearchproject/opensearch-dashboards:2.13.0
+    container_name: opensearch-dashboards
+    ports:
+      - 5601:5601
+    expose:
+      - "5601" # Expose port 5601 for web access to OpenSearch Dashboards
+    environment:
+      OPENSEARCH_HOSTS: '["https://opensearch:9200"]' # Define the OpenSearch nodes that OpenSearch Dashboards will query
   kafka:
     image: docker.io/bitnami/kafka:3.7
     hostname: kafka