diff --git a/scripts/generator/templates/template-vaadin-bom.xml b/scripts/generator/templates/template-vaadin-bom.xml
index 5b5fa7280..6b40500a8 100644
--- a/scripts/generator/templates/template-vaadin-bom.xml
+++ b/scripts/generator/templates/template-vaadin-bom.xml
@@ -115,6 +115,13 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
+
+            <!-- workaround,should be removed after this module has been added to hilla-bom -->
+            <dependency>
+                <groupId>com.vaadin.hilla</groupId>
+                <artifactId>hilla-dev-mode</artifactId>
+                <version>${hilla.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/scripts/generator/templates/template-vaadin-spring-bom.xml b/scripts/generator/templates/template-vaadin-spring-bom.xml
index fda03624c..651071c62 100644
--- a/scripts/generator/templates/template-vaadin-spring-bom.xml
+++ b/scripts/generator/templates/template-vaadin-spring-bom.xml
@@ -25,6 +25,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.vaadin.hilla</groupId>
+                <artifactId>hilla-bom</artifactId>
+                <version>${hilla.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin</artifactId>
diff --git a/vaadin-spring-boot-starter/pom.xml b/vaadin-spring-boot-starter/pom.xml
index 1c7c38a48..88337db83 100644
--- a/vaadin-spring-boot-starter/pom.xml
+++ b/vaadin-spring-boot-starter/pom.xml
@@ -53,6 +53,10 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin.hilla</groupId>
+            <artifactId>hilla</artifactId>
+        </dependency>
 
         <!-- Spring -->
         <dependency>
diff --git a/versions.json b/versions.json
index 22491ddd7..d28fb2f63 100644
--- a/versions.json
+++ b/versions.json
@@ -104,6 +104,9 @@
         "flow": {
             "javaVersion": "24.4.0.alpha3"
         },
+        "hilla": {
+            "javaVersion": "24.4.0.alpha2"
+        },
         "flow-cdi": {
             "javaVersion": "15.0.1"
         },