diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
index e2f3597..d509539 100644
--- a/.github/workflows/broken-links.yml
+++ b/.github/workflows/broken-links.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
+        uses: lycheeverse/lychee-action@5c4ee84814c983aa7164eaee476f014e53ff3963 # v2
         with:
           fail: false # Don't fail on broken links, create an issue instead
 
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index 05c0e76..05b481a 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -20,7 +20,6 @@ on:
       - 'assets/**'
 
 env:
-  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
   DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
 
 jobs:
@@ -42,6 +41,15 @@ jobs:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}
         cache: 'maven'
+    
+    - name: Cache Vaadin prod bundles
+      uses: actions/cache@v4
+      with:
+        path: |
+          **/bundles/prod.bundle
+        key: ${{ runner.os }}-vaadin-prod-bundles-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-vaadin-prod-bundles-
       
     - name: Build with Maven
       run: ./mvnw -B clean package -Pproduction
diff --git a/.gitignore b/.gitignore
index e567ca9..69325d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,10 +49,9 @@ tsconfig.json
 types.d.ts
 vite.config.ts
 vite.generated.ts
-/*/src/main/frontend/generated/
-/*/src/main/frontend/index.html
-/*/src/main/dev-bundle/
-/*/src/main/bundles/
+**/src/main/frontend/generated/
+**/src/main/frontend/index.html
+**/src/main/bundles/
 *.lock
 
 
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index b52c3e2..d43641c 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.21.0</checkstyleVersion>
+    <checkstyleVersion>10.26.1</checkstyleVersion>
     <scanScope>JavaOnlyWithTests</scanScope>
     <suppressErrors>true</suppressErrors>
     <copyLibs>true</copyLibs>
diff --git a/pom.xml b/pom.xml
index 1f1a743..16256aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.26.1</version>
+								<version>11.0.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
diff --git a/vaadin-simple-grid-filter-demo/pom.xml b/vaadin-simple-grid-filter-demo/pom.xml
index 43d8bd3..3b453da 100644
--- a/vaadin-simple-grid-filter-demo/pom.xml
+++ b/vaadin-simple-grid-filter-demo/pom.xml
@@ -29,9 +29,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.8.3</vaadin.version>
+		<vaadin.version>24.8.5</vaadin.version>
 
-		<org.springframework.boot.version>3.5.3</org.springframework.boot.version>
+		<org.springframework.boot.version>3.5.4</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/vaadin-simple-grid-filter/pom.xml b/vaadin-simple-grid-filter/pom.xml
index 3aab42f..9ef06ac 100644
--- a/vaadin-simple-grid-filter/pom.xml
+++ b/vaadin-simple-grid-filter/pom.xml
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.8.3</vaadin.version>
+		<vaadin.version>24.8.5</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -121,21 +121,6 @@
 				</executions>
 			</plugin>
 
-			<!-- Take care of synchronizing java dependencies and imports in package.json 
-				and main.js files. It also creates webpack.config.js if not exists yet. -->
-			<plugin>
-				<groupId>com.vaadin</groupId>
-				<artifactId>vaadin-maven-plugin</artifactId>
-				<version>${vaadin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>prepare-frontend</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -281,7 +266,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.26.1</version>
+								<version>11.0.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>