diff --git a/README.md b/README.md
index 2b7a9db..d3b09c1 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,10 @@ The docker image for the worker is published to [GitHub Packages](https://github
 ```
 docker pull ghcr.io/camunda-community-hub/zeebe-dmn-worker:1.0.0
 ```
-* configure the connection to the Zeebe broker by setting `zeebe.client.broker.contactPoint` (default: `localhost:26500`) 
+* configure the connection to the Zeebe gateway by setting `zeebe.client.broker.gatewayAddress` (default: `localhost:26500`) 
 * configure the folder where the DMN files are located by setting `zeebe.client.worker.dmn.repository` (default: `dmn-repo`)
 
-For a local setup, the repository contains a [docker-compose file](docker/docker-compose.yml). It starts a Zeebe broker and the worker. 
+For a local setup, the repository contains a [docker-compose file](docker/docker-compose.yml). It starts a Zeebe broker with an embedded gateway and the worker. 
 
 ```
 cd docker
@@ -76,7 +76,7 @@ zeebe:
       dmn.repository: dmn-repo
 
     job.timeout: 10000
-    broker.contactPoint: 127.0.0.1:26500
+    broker.gatewayAddress: 127.0.0.1:26500
     security.plaintext: true
 ```
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3dc30c2..5d9a401 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     container_name: zeebe-dmn-worker
     image: ghcr.io/camunda-community-hub/zeebe-dmn-worker:1.0.0
     environment:
-      - zeebe.client.broker.contactPoint=zeebe:26500
+      - zeebe.client.broker.gatewayAddress=zeebe:26500
       - zeebe.client.worker.dmn.repository=/usr/share/zeebe/dmn-repo
     volumes:
       - ./dmn-repo:/usr/share/zeebe/dmn-repo
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index ecde08f..104063e 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -13,7 +13,7 @@ zeebe:
 
     job.timeout: 10000
     # remove the following two lines when using Camunda Cloud SaaS
-    broker.contactPoint: 127.0.0.1:26500
+    broker.gatewayAddress: 127.0.0.1:26500
     security.plaintext: true
 
 logging:
diff --git a/src/test/java/io/zeebe/dmn/WorkflowTest.java b/src/test/java/io/zeebe/dmn/WorkflowTest.java
index a60d8d5..b8f4848 100644
--- a/src/test/java/io/zeebe/dmn/WorkflowTest.java
+++ b/src/test/java/io/zeebe/dmn/WorkflowTest.java
@@ -43,11 +43,11 @@ public class WorkflowTest {
   @BeforeAll
   public static void init() {
 
-    final var gatewayContactPoint = ZEEBE_CONTAINER.getExternalGatewayAddress();
-    System.setProperty("zeebe.client.broker.contactPoint", gatewayContactPoint);
+    final var gatewayAddress = ZEEBE_CONTAINER.getExternalGatewayAddress();
+    System.setProperty("zeebe.client.broker.gatewayAddress", gatewayAddress);
 
     ZEEBE_CLIENT =
-        ZeebeClient.newClientBuilder().gatewayAddress(gatewayContactPoint).usePlaintext().build();
+        ZeebeClient.newClientBuilder().gatewayAddress(gatewayAddress).usePlaintext().build();
 
     // given
     final BpmnModelInstance process =