diff --git a/bpmn-model/src/main/java/io/zeebe/model/bpmn/builder/AbstractFlowNodeBuilder.java b/bpmn-model/src/main/java/io/zeebe/model/bpmn/builder/AbstractFlowNodeBuilder.java
index 5b3926961cfc..5e306ddee775 100644
--- a/bpmn-model/src/main/java/io/zeebe/model/bpmn/builder/AbstractFlowNodeBuilder.java
+++ b/bpmn-model/src/main/java/io/zeebe/model/bpmn/builder/AbstractFlowNodeBuilder.java
@@ -365,8 +365,7 @@ public AbstractExclusiveGatewayBuilder<?> moveToLastExclusiveGateway() {
     }
   }
 
-  @SuppressWarnings("rawtypes")
-  public AbstractFlowNodeBuilder connectTo(String identifier) {
+  public AbstractFlowNodeBuilder<?, ?> connectTo(String identifier) {
     final ModelElementInstance target = modelInstance.getModelElementById(identifier);
     if (target == null) {
       throw new BpmnModelException(
diff --git a/bpmn-model/src/test/java/io/zeebe/model/bpmn/builder/ProcessBuilderTest.java b/bpmn-model/src/test/java/io/zeebe/model/bpmn/builder/ProcessBuilderTest.java
index dd4c95a38d93..42cb545fd934 100644
--- a/bpmn-model/src/test/java/io/zeebe/model/bpmn/builder/ProcessBuilderTest.java
+++ b/bpmn-model/src/test/java/io/zeebe/model/bpmn/builder/ProcessBuilderTest.java
@@ -1919,6 +1919,17 @@ public void testMoveToDoesNotReturnRawBuilders() {
         .serviceTask("task", b -> b.name("name"));
   }
 
+  /** or else generic types in parameters are not available and things won't compile */
+  @Test
+  public void testConnectToDoesNotReturnRawBuilder() {
+    Bpmn.createProcess()
+        .startEvent()
+        .serviceTask("goto")
+        .connectTo("goto")
+        .serviceTask("task", b -> b.name("name"))
+        .done();
+  }
+
   protected Message assertMessageEventDefinition(String elementId, String messageName) {
     final MessageEventDefinition messageEventDefinition =
         assertAndGetSingleEventDefinition(elementId, MessageEventDefinition.class);