diff --git a/.github/workflows/test-core-opensearch.yaml b/.github/workflows/test-core-opensearch.yaml
new file mode 100644
index 00000000..111d639f
--- /dev/null
+++ b/.github/workflows/test-core-opensearch.yaml
@@ -0,0 +1,12 @@
+name: "Test docker-compose-core.opensearch.yaml"
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test_core:
+    uses: ./.github/workflows/template-deploy.yaml
+    secrets: inherit
+    with:
+      compose_args: "-f docker-compose-core.opensearch.yaml"
+      run_e2e_tests: false
\ No newline at end of file
diff --git a/.github/workflows/test-default.opensearch.yaml b/.github/workflows/test-default.opensearch.yaml
new file mode 100644
index 00000000..5ea5debc
--- /dev/null
+++ b/.github/workflows/test-default.opensearch.yaml
@@ -0,0 +1,12 @@
+name: "Test docker-compose.opensearch.yaml"
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test_docker_compose_yaml:
+    uses: ./.github/workflows/template-deploy.yaml
+    secrets: inherit
+    with:
+      compose_args: "-f docker-compose.opensearch.yaml"
+      run_e2e_tests: false
\ No newline at end of file
diff --git a/.github/workflows/test-modeler.opensearch.yaml b/.github/workflows/test-modeler.opensearch.yaml
new file mode 100644
index 00000000..326dce2b
--- /dev/null
+++ b/.github/workflows/test-modeler.opensearch.yaml
@@ -0,0 +1,12 @@
+name: "Test docker-compose-web-modeler.yaml with OpenSearch"
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test_modeler_yaml:
+    uses: ./.github/workflows/template-deploy.yaml
+    secrets: inherit
+    with:
+      compose_args: "-f docker-compose.opensearch.yaml -f docker-compose-web-modeler.yaml"
+      run_e2e_tests: true
\ No newline at end of file
diff --git a/docker-compose-core.opensearch.yaml b/docker-compose-core.opensearch.yaml
index 282ceadb..7f8c0169 100644
--- a/docker-compose-core.opensearch.yaml
+++ b/docker-compose-core.opensearch.yaml
@@ -1,3 +1,14 @@
+# While the Docker images themselves are supported for production usage,
+# this docker-compose.yaml is designed to be used by developers to run
+# an environment locally. It is not designed to be used in production.
+# We recommend to use Kubernetes in production with our Helm Charts:
+# https://docs.camunda.io/docs/self-managed/platform-deployment/kubernetes-helm/
+# For local development, we recommend using KIND instead of `docker-compose`:
+# https://docs.camunda.io/docs/self-managed/platform-deployment/helm-kubernetes/guides/local-kubernetes-cluster/
+
+# This is a lightweight configuration with Zeebe, Operate, Tasklist, and OpenSearch
+# See docker-compose.yml for a configuration that also includes Optimize, Identity, and Keycloak.
+
 services:
   
   opensearch-init:
@@ -36,7 +47,7 @@ services:
       - opensearch
 
   operate: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#operate
-    image: camunda/operate:${CAMUNDA_PLATFORM_VERSION}
+    image: camunda/operate:${CAMUNDA_OPERATE_VERSION}
     container_name: operate
     ports:
       - "8081:8080"
@@ -61,7 +72,7 @@ services:
       - opensearch
 
   tasklist: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#tasklist
-    image: camunda/tasklist:${CAMUNDA_PLATFORM_VERSION}
+    image: camunda/tasklist:${CAMUNDA_TASKLIST_VERSION}
     container_name: tasklist
     ports:
       - "8082:8080"
diff --git a/docker-compose.opensearch.yml b/docker-compose.opensearch.yaml
similarity index 98%
rename from docker-compose.opensearch.yml
rename to docker-compose.opensearch.yaml
index 78b77d9f..7f7aa238 100644
--- a/docker-compose.opensearch.yml
+++ b/docker-compose.opensearch.yaml
@@ -6,7 +6,7 @@
 # For local development, we recommend using KIND instead of `docker-compose`:
 # https://docs.camunda.io/docs/self-managed/platform-deployment/helm-kubernetes/guides/local-kubernetes-cluster/
 
-# This is a full configuration with Zeebe, Operate, Tasklist, Optimize, Identity, Keycloak, and Elasticsearch
+# This is a full configuration with Zeebe, Operate, Tasklist, Optimize, Identity, Keycloak, and OpenSearch
 # See docker-compose-core.yml for a lightweight configuration that does not include Optimize, Identity, and Keycloak.
 
 services:
@@ -53,7 +53,7 @@ services:
       - identity
 
   operate: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#operate
-    image: camunda/operate:${CAMUNDA_PLATFORM_VERSION}
+    image: camunda/operate:${CAMUNDA_OPERATE_VERSION}
     container_name: operate
     ports:
       - "8081:8080"
@@ -98,7 +98,7 @@ services:
       - opensearch
 
   tasklist: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#tasklist
-    image: camunda/tasklist:${CAMUNDA_PLATFORM_VERSION}
+    image: camunda/tasklist:${CAMUNDA_TASKLIST_VERSION}
     container_name: tasklist
     ports:
       - "8082:8080"
@@ -223,7 +223,7 @@ services:
 
   identity: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#identity
     container_name: identity
-    image: camunda/identity:${CAMUNDA_PLATFORM_VERSION}
+    image: camunda/identity:${CAMUNDA_IDENTITY_VERSION}
     ports:
       - "8084:8084"
     environment: # https://docs.camunda.io/docs/self-managed/identity/deployment/configuration-variables/