diff --git a/connector/pom.xml b/connector/pom.xml
index 0b6c1cc..6eaf4d2 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>io.camunda.connector</groupId>
-      <artifactId>element-template-generator</artifactId>
+      <artifactId>element-template-generator-core</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/connector/src/main/java/io/camunda/community/connector/script/ScriptConnector.java b/connector/src/main/java/io/camunda/community/connector/script/ScriptConnector.java
index cd10cfa..326cc03 100644
--- a/connector/src/main/java/io/camunda/community/connector/script/ScriptConnector.java
+++ b/connector/src/main/java/io/camunda/community/connector/script/ScriptConnector.java
@@ -6,7 +6,7 @@
 import io.camunda.connector.api.annotation.OutboundConnector;
 import io.camunda.connector.api.outbound.OutboundConnectorContext;
 import io.camunda.connector.api.outbound.OutboundConnectorFunction;
-import io.camunda.connector.generator.annotation.ElementTemplate;
+import io.camunda.connector.generator.java.annotation.ElementTemplate;
 
 @OutboundConnector(
     type = ScriptConnector.SCRIPT_CONNECTOR_TYPE,
diff --git a/connector/src/main/java/io/camunda/community/connector/script/ScriptConnectorInput.java b/connector/src/main/java/io/camunda/community/connector/script/ScriptConnectorInput.java
index 9b6dffd..3adc3b1 100644
--- a/connector/src/main/java/io/camunda/community/connector/script/ScriptConnectorInput.java
+++ b/connector/src/main/java/io/camunda/community/connector/script/ScriptConnectorInput.java
@@ -6,8 +6,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import io.camunda.community.connector.script.ScriptConnectorInput.Type.Embedded;
 import io.camunda.community.connector.script.ScriptConnectorInput.Type.Resource;
-import io.camunda.connector.generator.annotation.TemplateProperty;
 import io.camunda.connector.generator.dsl.Property.FeelMode;
+import io.camunda.connector.generator.java.annotation.TemplateProperty;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 0b8566f..caf39e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,16 +24,16 @@
     <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
     <project.build.resourceEncoding>${encoding}</project.build.resourceEncoding>
 
-    <version.java>17</version.java>
+    <version.java>21</version.java>
     <java.version>${version.java}</java.version>
 
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
     <version.spring-boot>3.3.4</version.spring-boot>
-    <version.camunda>8.6.1</version.camunda>
-    <version.camunda-spring>8.3.7</version.camunda-spring>
-    <version.camunda-connectors>8.3.0</version.camunda-connectors>
+    <version.camunda>8.5.8</version.camunda>
+    <version.camunda-spring>8.5.13</version.camunda-spring>
+    <version.camunda-connectors>8.6.2</version.camunda-connectors>
 
     <version.groovy>2.4.21</version.groovy>
     <version.kotlin>1.9.25</version.kotlin>
@@ -80,6 +80,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>1.65.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.camunda.connector</groupId>
         <artifactId>connector-core</artifactId>
@@ -87,7 +94,7 @@
       </dependency>
       <dependency>
         <groupId>io.camunda.connector</groupId>
-        <artifactId>element-template-generator</artifactId>
+        <artifactId>element-template-generator-core</artifactId>
         <version>${version.camunda-connectors}</version>
       </dependency>
       <dependency>
@@ -95,6 +102,11 @@
         <artifactId>spring-boot-starter-camunda-test</artifactId>
         <version>${version.camunda-spring}</version>
       </dependency>
+      <dependency>
+        <groupId>io.camunda.spring</groupId>
+        <artifactId>spring-boot-starter-camunda</artifactId>
+        <version>${version.camunda-spring}</version>
+      </dependency>
       <dependency>
         <groupId>io.camunda.connector</groupId>
         <artifactId>spring-boot-starter-camunda-connectors</artifactId>
@@ -191,7 +203,7 @@
           <configuration>
             <image>
               <env>
-                <BP_JVM_VERSION>17</BP_JVM_VERSION>
+                <BP_JVM_VERSION>${version.java}</BP_JVM_VERSION>
                 <BPE_LANG>en_US.utf8</BPE_LANG>
               </env>
               <createdDate>${maven.build.timestamp}</createdDate>