diff --git a/commands/env.cmd b/commands/env.cmd
index e10030fa..a583fc46 100644
--- a/commands/env.cmd
+++ b/commands/env.cmd
@@ -77,6 +77,9 @@ fi
 [[ ${WARDEN_ELASTICSEARCH} -eq 1 ]] \
     && appendEnvPartialIfExists "elasticsearch"
 
+[[ ${WARDEN_OPENSEARCH} -eq 1 ]] \
+    && appendEnvPartialIfExists "opensearch"
+
 [[ ${WARDEN_VARNISH} -eq 1 ]] \
     && appendEnvPartialIfExists "varnish"
 
diff --git a/environments/includes/opensearch.base.yml b/environments/includes/opensearch.base.yml
new file mode 100644
index 00000000..7146824e
--- /dev/null
+++ b/environments/includes/opensearch.base.yml
@@ -0,0 +1,20 @@
+version: "3.5"
+services:
+  opensearch:
+    hostname: "${WARDEN_ENV_NAME}-opensearch"
+    image: ${WARDEN_IMAGE_REPOSITORY}/opensearch:${OPENSEARCH_VERSION:-1.2}
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.${WARDEN_ENV_NAME}-opensearch.tls=true
+      - traefik.http.routers.${WARDEN_ENV_NAME}-opensearch.rule=Host(`opensearch.${TRAEFIK_DOMAIN}`)
+      - traefik.http.services.${WARDEN_ENV_NAME}-opensearch.loadbalancer.server.port=9200
+      - traefik.docker.network=${WARDEN_ENV_NAME}_default
+    environment:
+      - DISABLE_SECURITY_PLUGIN=true
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms64m -Xmx512m"
+    volumes:
+      - osdata:/usr/share/opensearch/data
+
+volumes:
+  osdata:
\ No newline at end of file