diff --git a/.github/workflows/tag-and-publish.yml b/.github/workflows/tag-and-publish.yml
index 2d7843b8..2ad8ed5d 100644
--- a/.github/workflows/tag-and-publish.yml
+++ b/.github/workflows/tag-and-publish.yml
@@ -25,7 +25,7 @@ jobs:
           - 9200:9200
           - 9300:9300
       zeebe:
-        image: camunda/zeebe:8.4.5
+        image: camunda/zeebe:8.5.0
         env:
           JAVA_TOOL_OPTIONS: "-Xms512m -Xmx512m"
           ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME: io.camunda.zeebe.exporter.ElasticsearchExporter
diff --git a/zeebe-extra/.github/workflows/build-docs.yml b/zeebe-extra/.github/workflows/build-docs.yml
index caccb8ae..d9d2f97b 100644
--- a/zeebe-extra/.github/workflows/build-docs.yml
+++ b/zeebe-extra/.github/workflows/build-docs.yml
@@ -23,7 +23,7 @@ jobs:
           - 9200:9200
           - 9300:9300
       zeebe:
-        image: camunda/zeebe:8.3.3
+        image: camunda/zeebe:8.5.0
         env:
           JAVA_TOOL_OPTIONS: "-Xms512m -Xmx512m"
           ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME: io.camunda.zeebe.exporter.ElasticsearchExporter
diff --git a/zeebe-extra/.github/workflows/test.yml b/zeebe-extra/.github/workflows/test.yml
index 50525c4e..9d257a37 100644
--- a/zeebe-extra/.github/workflows/test.yml
+++ b/zeebe-extra/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       zeebe:
-        image: camunda/zeebe:8.3.3
+        image: camunda/zeebe:8.5.0
         ports:
           - 26500:26500
     steps:
diff --git a/zeebe-extra/docker/docker-compose.yml b/zeebe-extra/docker/docker-compose.yml
index 0d56e69a..70f5ca1f 100644
--- a/zeebe-extra/docker/docker-compose.yml
+++ b/zeebe-extra/docker/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   zeebe:
     restart: always
     container_name: zeebe_broker
-    image: camunda/zeebe:8.3.3
+    image: camunda/zeebe:8.5.0
     environment:
       - ZEEBE_LOG_LEVEL=debug
     volumes: