diff --git a/app/pom.xml b/app/pom.xml
index 24dfa59d..f55a7ace 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>2.1.0</version>
+        <version>2.3.0</version>
         <configuration>
           <to>
             <image>docker.io/camunda/zeeqs</image>
diff --git a/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt b/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt
index 5ddafcc8..8abfb1e7 100644
--- a/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt
+++ b/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt
@@ -4,7 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
 
 @ConstructorBinding
-@ConfigurationProperties("io.zeebe.hazelcast")
+@ConfigurationProperties("zeebe.hazelcast")
 data class HazelcastProperties(
-        val connection: String = "localhost:5701"
+        val connection: String = "localhost:5701",
+        val connectionTimeout: String = "PT30S"
 )
\ No newline at end of file
diff --git a/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt b/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt
index cf98c63f..316d27ed 100644
--- a/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt
+++ b/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt
@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.cache.annotation.EnableCaching
+import java.time.Duration
 import javax.annotation.PostConstruct
 
 @SpringBootApplication
@@ -20,9 +21,10 @@ class ZeeqlApplication(
     @PostConstruct
     fun init() {
         val connection = hazelcastProperties.connection
+        val connectionTimeout = Duration.parse(hazelcastProperties.connectionTimeout)
 
         logger.info("connect to Hazelcast: '$connection'")
-        hazelcastImporter.start(connection)
+        hazelcastImporter.start(connection, connectionTimeout)
     }
 }
 
diff --git a/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt b/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt
index 9c3bbdc6..f6964743 100644
--- a/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt
+++ b/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt
@@ -29,7 +29,7 @@ class WorkflowServiceTest(
         val bpmn = Bpmn.createExecutableProcess("wf")
                 .startEvent("s").name("start")
                 .serviceTask("t").name("task")
-                .zeebeTaskType("test")
+                .zeebeJobType("test")
                 .endEvent("e").name("")
                 .done()
 
diff --git a/docker/application.yaml b/docker/application.yaml
new file mode 100644
index 00000000..d952f3a4
--- /dev/null
+++ b/docker/application.yaml
@@ -0,0 +1,6 @@
+zeebe:
+  broker:
+    exporters:
+      hazelcast:
+        className: io.zeebe.hazelcast.exporter.HazelcastExporter
+        jarPath: exporters/zeebe-hazelcast-exporter.jar
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5d2e9717..7073d56c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 services:
   zeebe:
     container_name: zeebe_broker
-    image: camunda/zeebe:0.22.2
+    image: camunda/zeebe:0.23.1
     environment:
       - ZEEBE_LOG_LEVEL=debug
     ports:
@@ -16,14 +16,15 @@ services:
       - "5701:5701"
     volumes:
       - ../target/exporter/zeebe-hazelcast-exporter.jar:/usr/local/zeebe/exporters/zeebe-hazelcast-exporter.jar
-      - ./zeebe.cfg.toml:/usr/local/zeebe/conf/zeebe.cfg.toml
+      - ./application.yaml:/usr/local/zeebe/config/application.yaml
     networks:
       - zeebe_network
-  monitor:
+
+  zeeqs:
     container_name: zeeqs
     image: camunda/zeeqs:latest
     environment:
-      - io.zeebe.hazelcast.connection=zeebe:5701
+      - zeebe.hazelcast.connection=zeebe:5701
     ports:
       - "9000:9000"
     depends_on:
diff --git a/docker/zeebe.cfg.toml b/docker/zeebe.cfg.toml
deleted file mode 100644
index 4c01b6fd..00000000
--- a/docker/zeebe.cfg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[[exporters]]
-id = "hazelcast"
-className = "io.zeebe.hazelcast.exporter.HazelcastExporter"
-jarPath = "exporters/zeebe-hazelcast-exporter.jar"
diff --git a/graphql-api/pom.xml b/graphql-api/pom.xml
index 4083b804..aa97d59c 100644
--- a/graphql-api/pom.xml
+++ b/graphql-api/pom.xml
@@ -19,18 +19,18 @@
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
+      <groupId>com.graphql-java-kickstart</groupId>
       <artifactId>graphql-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
-      <artifactId>graphql-java-tools</artifactId>
+      <groupId>com.graphql-java-kickstart</groupId>
+      <artifactId>graphiql-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
-      <artifactId>graphiql-spring-boot-starter</artifactId>
+      <groupId>com.graphql-java-kickstart</groupId>
+      <artifactId>graphql-java-tools</artifactId>
     </dependency>
 
     <dependency>
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt
index d2273595..6ea6bc08 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Incident
 import org.springframework.stereotype.Component
 
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt
index e02de0ff..7de36e7c 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Job
 import org.springframework.stereotype.Component
 
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt
index 9c4d5d75..09292fee 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import org.springframework.stereotype.Component
 
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt
index 15e4f15c..a020a5af 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Workflow
 import org.springframework.stereotype.Component
 
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt
index 0013dc96..9684253b 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.WorkflowInstance
 import org.springframework.stereotype.Component
 
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt
index 65997f08..b7d5a9de 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.MessageSubscription
 import io.zeebe.zeeqs.data.entity.Timer
 import io.zeebe.zeeqs.data.entity.Workflow
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt
index 193556cc..30f44efa 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.IncidentState
 import io.zeebe.zeeqs.data.repository.IncidentRepository
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt
index 17934636..9b2bcc68 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Job
 import io.zeebe.zeeqs.data.entity.JobState
 import io.zeebe.zeeqs.data.repository.JobRepository
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt
index efd3a638..a99d8d5f 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.repository.MessageRepository
 import io.zeebe.zeeqs.graphql.resolvers.connection.MessageConnection
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt
index 3eb6c255..60af572b 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Variable
 import io.zeebe.zeeqs.data.repository.VariableRepository
 import org.springframework.stereotype.Component
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt
index 469d75cc..92364608 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.WorkflowInstance
 import io.zeebe.zeeqs.data.entity.WorkflowInstanceState
 import io.zeebe.zeeqs.data.repository.WorkflowInstanceRepository
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt
index 828b3feb..9582631c 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Workflow
 import io.zeebe.zeeqs.data.repository.WorkflowRepository
 import io.zeebe.zeeqs.graphql.resolvers.connection.WorkflowConnection
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt
index ddc7cdd8..e00f1fd6 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import io.zeebe.zeeqs.data.service.WorkflowService
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt
index ae6c3361..0b07636e 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstanceStateTransition
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension
 import org.springframework.stereotype.Component
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt
index cee0e0b0..29da24c4 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.Job
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt
index 49de7549..f07b7deb 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.Job
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt
index ba2e73c4..4c827fdc 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.entity.MessageCorrelation
 import io.zeebe.zeeqs.data.entity.MessageSubscription
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt
index 8d9a4529..c6950c92 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.entity.MessageCorrelation
 import io.zeebe.zeeqs.data.entity.MessageSubscription
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt
index 1cbc1a23..2edf885f 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.ElementInstanceRepository
 import io.zeebe.zeeqs.data.repository.MessageCorrelationRepository
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt
index d838414e..a5a4ad0e 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.type
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Timer
 import io.zeebe.zeeqs.data.entity.Workflow
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt
index 36e16a38..0f847e79 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Variable
 import io.zeebe.zeeqs.data.entity.VariableUpdate
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt
index 237388f4..960236b5 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.VariableUpdate
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension
 import org.springframework.stereotype.Component
diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt
index 808ec206..3ffd4548 100644
--- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt
+++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension.timestampToString
diff --git a/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt b/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt
index 3e3821d3..a34cdabd 100644
--- a/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt
+++ b/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt
@@ -7,6 +7,8 @@ import io.zeebe.hazelcast.connect.java.ZeebeHazelcast
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import org.springframework.stereotype.Component
+import java.time.Duration
+
 
 @Component
 class HazelcastImporter(
@@ -26,7 +28,7 @@ class HazelcastImporter(
 
     var zeebeHazelcast: ZeebeHazelcast? = null
 
-    fun start(hazelcastConnection: String) {
+    fun start(hazelcastConnection: String, hazelcastConnectionTimeout: Duration) {
 
         val hazelcastConfig = hazelcastConfigRepository.findById(hazelcastConnection)
                 .orElse(HazelcastConfig(
@@ -41,9 +43,9 @@ class HazelcastImporter(
         val clientConfig = ClientConfig()
         val networkConfig = clientConfig.networkConfig
         networkConfig.addresses = listOf(hazelcastConnection)
-        // networkConfig.connectionAttemptPeriod = Duration.ofSeconds(10).toMillis().toInt()
-        // networkConfig.connectionAttemptLimit = 10
-        // networkConfig.connectionTimeout = Duration.ofSeconds(10).toMillis().toInt()
+
+        val connectionRetryConfig = clientConfig.connectionStrategyConfig.connectionRetryConfig
+        connectionRetryConfig.clusterConnectTimeoutMillis = hazelcastConnectionTimeout.toMillis()
 
         val hazelcast = HazelcastClient.newHazelcastClient(clientConfig)
 
diff --git a/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt b/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt
index 9a32a487..c4004d6c 100644
--- a/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt
+++ b/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt
@@ -46,7 +46,7 @@ class HazelcastImporterTest(
     fun `should import workflow`() {
         // given
         val port = zeebe.getMappedPort(hazelcastPort)
-        importer.start("localhost:$port")
+        importer.start("localhost:$port", Duration.ofSeconds(10))
 
         val client = ZeebeClient.newClientBuilder()
                 .brokerContactPoint(zeebe.getExternalAddress(ZeebePort.GATEWAY))
@@ -58,7 +58,7 @@ class HazelcastImporterTest(
                 .addWorkflowModel(
                         Bpmn.createExecutableProcess("wf")
                                 .startEvent()
-                                .serviceTask("task-1").zeebeTaskType("test")
+                                .serviceTask("task-1").zeebeJobType("test")
                                 .endEvent()
                                 .done(),
                         "wf.bpmn")
diff --git a/pom.xml b/pom.xml
index 66b0d57e..ce689833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,16 @@
   <properties>
     <kotlin.version>1.3.70</kotlin.version>
 
-    <zeebe.version>0.22.1</zeebe.version>
+    <zeebe.version>0.23.1</zeebe.version>
 
-    <spring.boot.version>2.2.3.RELEASE</spring.boot.version>
-    <hazelcast.exporter.version>0.8.0-alpha2</hazelcast.exporter.version>
-    <graphql.version>5.0.2</graphql.version>
-    <graphql.tools.version>5.2.4</graphql.tools.version>
+    <spring.boot.version>2.3.0.RELEASE</spring.boot.version>
+
+    <hazelcast.exporter.version>0.9.0</hazelcast.exporter.version>
+    <!-- pin Hazelcast version because of spring-boot-dependencies -->
+    <version.hazelcast>4.0.1</version.hazelcast>
+
+    <version.graphql>7.0.1</version.graphql>
+    <version.graphql.tools>6.0.2</version.graphql.tools>
     <zeebe-test-container.version>0.32.0</zeebe-test-container.version>
     <test-container.version>1.12.5</test-container.version>
 
@@ -93,21 +97,27 @@
       </dependency>
 
       <dependency>
-        <groupId>com.graphql-java</groupId>
+        <groupId>com.hazelcast</groupId>
+        <artifactId>hazelcast</artifactId>
+        <version>${version.hazelcast}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-spring-boot-starter</artifactId>
-        <version>${graphql.version}</version>
+        <version>${version.graphql}</version>
       </dependency>
 
       <dependency>
-        <groupId>com.graphql-java</groupId>
+        <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphiql-spring-boot-starter</artifactId>
-        <version>${graphql.version}</version>
+        <version>${version.graphql}</version>
       </dependency>
 
       <dependency>
-        <groupId>com.graphql-java</groupId>
+        <groupId>com.graphql-java-kickstart</groupId>
         <artifactId>graphql-java-tools</artifactId>
-        <version>${graphql.tools.version}</version>
+        <version>${version.graphql.tools}</version>
       </dependency>
 
       <dependency>