diff --git a/01-hellodemo/pom.xml b/01-hellodemo/pom.xml
index 07d0486..1bd6015 100644
--- a/01-hellodemo/pom.xml
+++ b/01-hellodemo/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.luv2code</groupId>
@@ -14,7 +14,7 @@
 	<name>hellodemo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -23,12 +23,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/02-spring-boot-3-spring-mvc-crud-local/HELP.md b/02-spring-boot-spring-mvc-crud-local/HELP.md
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/HELP.md
rename to 02-spring-boot-spring-mvc-crud-local/HELP.md
diff --git a/02-spring-boot-3-spring-mvc-crud-local/mvnw b/02-spring-boot-spring-mvc-crud-local/mvnw
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/mvnw
rename to 02-spring-boot-spring-mvc-crud-local/mvnw
diff --git a/02-spring-boot-3-spring-mvc-crud-local/mvnw.cmd b/02-spring-boot-spring-mvc-crud-local/mvnw.cmd
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/mvnw.cmd
rename to 02-spring-boot-spring-mvc-crud-local/mvnw.cmd
diff --git a/02-spring-boot-3-spring-mvc-crud-local/pom.xml b/02-spring-boot-spring-mvc-crud-local/pom.xml
similarity index 89%
rename from 02-spring-boot-3-spring-mvc-crud-local/pom.xml
rename to 02-spring-boot-spring-mvc-crud-local/pom.xml
index 22ab1bc..b49d12a 100644
--- a/02-spring-boot-3-spring-mvc-crud-local/pom.xml
+++ b/02-spring-boot-spring-mvc-crud-local/pom.xml
@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	
+
 	<groupId>com.luv2code.springboot</groupId>
 	<artifactId>employee-crud-demo</artifactId>
 	<version>1.0.0</version>
-	
+
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 	
 	<dependencies>
@@ -36,7 +36,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -48,7 +48,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/02-spring-boot-3-spring-mvc-crud-local/sql-scripts/01-create-user.sql b/02-spring-boot-spring-mvc-crud-local/sql-scripts/01-create-user.sql
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/sql-scripts/01-create-user.sql
rename to 02-spring-boot-spring-mvc-crud-local/sql-scripts/01-create-user.sql
diff --git a/02-spring-boot-3-spring-mvc-crud-local/sql-scripts/02-employee-directory.sql b/02-spring-boot-spring-mvc-crud-local/sql-scripts/02-employee-directory.sql
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/sql-scripts/02-employee-directory.sql
rename to 02-spring-boot-spring-mvc-crud-local/sql-scripts/02-employee-directory.sql
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java b/02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
rename to 02-spring-boot-spring-mvc-crud-local/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/resources/application.properties b/02-spring-boot-spring-mvc-crud-local/src/main/resources/application.properties
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/resources/application.properties
rename to 02-spring-boot-spring-mvc-crud-local/src/main/resources/application.properties
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/resources/static/index.html b/02-spring-boot-spring-mvc-crud-local/src/main/resources/static/index.html
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/resources/static/index.html
rename to 02-spring-boot-spring-mvc-crud-local/src/main/resources/static/index.html
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/employees/employee-form.html b/02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/employees/employee-form.html
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/employees/employee-form.html
rename to 02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/employees/employee-form.html
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/employees/list-employees.html b/02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/employees/list-employees.html
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/employees/list-employees.html
rename to 02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/employees/list-employees.html
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/helloworld.html b/02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/helloworld.html
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/main/resources/templates/helloworld.html
rename to 02-spring-boot-spring-mvc-crud-local/src/main/resources/templates/helloworld.html
diff --git a/02-spring-boot-3-spring-mvc-crud-local/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java b/02-spring-boot-spring-mvc-crud-local/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
similarity index 100%
rename from 02-spring-boot-3-spring-mvc-crud-local/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
rename to 02-spring-boot-spring-mvc-crud-local/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/HELP.md b/03-spring-boot-spring-mvc-crud-aws-application-profiles/HELP.md
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/HELP.md
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/HELP.md
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/mvnw b/03-spring-boot-spring-mvc-crud-aws-application-profiles/mvnw
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/mvnw
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/mvnw
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/mvnw.cmd b/03-spring-boot-spring-mvc-crud-aws-application-profiles/mvnw.cmd
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/mvnw.cmd
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/mvnw.cmd
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/pom.xml b/03-spring-boot-spring-mvc-crud-aws-application-profiles/pom.xml
similarity index 89%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/pom.xml
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/pom.xml
index 22ab1bc..b49d12a 100644
--- a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/pom.xml
+++ b/03-spring-boot-spring-mvc-crud-aws-application-profiles/pom.xml
@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	
+
 	<groupId>com.luv2code.springboot</groupId>
 	<artifactId>employee-crud-demo</artifactId>
 	<version>1.0.0</version>
-	
+
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 	
 	<dependencies>
@@ -36,7 +36,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -48,7 +48,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/sql-scripts/01-create-user.sql b/03-spring-boot-spring-mvc-crud-aws-application-profiles/sql-scripts/01-create-user.sql
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/sql-scripts/01-create-user.sql
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/sql-scripts/01-create-user.sql
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/sql-scripts/02-employee-directory.sql b/03-spring-boot-spring-mvc-crud-aws-application-profiles/sql-scripts/02-employee-directory.sql
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/sql-scripts/02-employee-directory.sql
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/sql-scripts/02-employee-directory.sql
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/application-prod.properties b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/application-prod.properties
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/application-prod.properties
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/application-prod.properties
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/application.properties b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/application.properties
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/application.properties
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/application.properties
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/static/index.html b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/static/index.html
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/static/index.html
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/static/index.html
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/employee-form.html b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/employee-form.html
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/employee-form.html
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/employee-form.html
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/list-employees.html b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/list-employees.html
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/list-employees.html
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/employees/list-employees.html
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/helloworld.html b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/helloworld.html
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/helloworld.html
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/main/resources/templates/helloworld.html
diff --git a/03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java b/03-spring-boot-spring-mvc-crud-aws-application-profiles/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
similarity index 100%
rename from 03-spring-boot-3-spring-mvc-crud-aws-application-profiles/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
rename to 03-spring-boot-spring-mvc-crud-aws-application-profiles/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/HELP.md b/04-spring-boot-spring-mvc-crud-aws-environment-variables/HELP.md
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/HELP.md
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/HELP.md
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/mvnw b/04-spring-boot-spring-mvc-crud-aws-environment-variables/mvnw
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/mvnw
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/mvnw
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/mvnw.cmd b/04-spring-boot-spring-mvc-crud-aws-environment-variables/mvnw.cmd
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/mvnw.cmd
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/mvnw.cmd
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/pom.xml b/04-spring-boot-spring-mvc-crud-aws-environment-variables/pom.xml
similarity index 89%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/pom.xml
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/pom.xml
index 22ab1bc..b49d12a 100644
--- a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/pom.xml
+++ b/04-spring-boot-spring-mvc-crud-aws-environment-variables/pom.xml
@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	
+
 	<groupId>com.luv2code.springboot</groupId>
 	<artifactId>employee-crud-demo</artifactId>
 	<version>1.0.0</version>
-	
+
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 	
 	<dependencies>
@@ -36,7 +36,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -48,7 +48,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/sql-scripts/01-create-user.sql b/04-spring-boot-spring-mvc-crud-aws-environment-variables/sql-scripts/01-create-user.sql
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/sql-scripts/01-create-user.sql
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/sql-scripts/01-create-user.sql
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/sql-scripts/02-employee-directory.sql b/04-spring-boot-spring-mvc-crud-aws-environment-variables/sql-scripts/02-employee-directory.sql
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/sql-scripts/02-employee-directory.sql
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/sql-scripts/02-employee-directory.sql
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/application.properties b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/application.properties
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/application.properties
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/application.properties
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/static/index.html b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/static/index.html
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/static/index.html
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/static/index.html
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/employee-form.html b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/employee-form.html
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/employee-form.html
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/employee-form.html
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/list-employees.html b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/list-employees.html
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/list-employees.html
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/employees/list-employees.html
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/helloworld.html b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/helloworld.html
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/helloworld.html
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/main/resources/templates/helloworld.html
diff --git a/04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java b/04-spring-boot-spring-mvc-crud-aws-environment-variables/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
similarity index 100%
rename from 04-spring-boot-3-spring-mvc-crud-aws-environment-variables/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
rename to 04-spring-boot-spring-mvc-crud-aws-environment-variables/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/HELP.md b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/HELP.md
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/HELP.md
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/HELP.md
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/mvnw b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/mvnw
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/mvnw
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/mvnw
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/mvnw.cmd b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/mvnw.cmd
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/mvnw.cmd
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/mvnw.cmd
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml
similarity index 90%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml
index 75446b0..d0a6bd1 100644
--- a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml
+++ b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml
@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	
+
 	<groupId>com.luv2code.springboot</groupId>
 	<artifactId>employee-crud-demo</artifactId>
 	<version>1.0.0</version>
-	
+
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 
 	<dependencyManagement>
@@ -23,7 +23,7 @@
 			<dependency>
 				<groupId>io.awspring.cloud</groupId>
 				<artifactId>spring-cloud-aws-dependencies</artifactId>
-				<version>3.1.0</version>
+				<version>4.0.0-M1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -54,7 +54,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -66,7 +66,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/01-create-user.sql b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/01-create-user.sql
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/01-create-user.sql
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/01-create-user.sql
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/02-employee-directory.sql b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/02-employee-directory.sql
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/02-employee-directory.sql
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/sql-scripts/02-employee-directory.sql
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/DemoController.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application-prod.properties b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application-prod.properties
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application-prod.properties
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application-prod.properties
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application.properties b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application.properties
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application.properties
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/application.properties
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/static/index.html b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/static/index.html
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/static/index.html
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/static/index.html
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/employee-form.html b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/employee-form.html
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/employee-form.html
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/employee-form.html
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/list-employees.html b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/list-employees.html
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/list-employees.html
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/employees/list-employees.html
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/helloworld.html b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/helloworld.html
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/helloworld.html
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/main/resources/templates/helloworld.html
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java b/05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
similarity index 100%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
rename to 05-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/HELP.md b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/HELP.md
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/HELP.md
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/HELP.md
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/README.md b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/README.md
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/README.md
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/README.md
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw.cmd b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw.cmd
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw.cmd
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/mvnw.cmd
diff --git a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml
similarity index 90%
rename from 05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml
index 75446b0..d0a6bd1 100644
--- a/05-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted/pom.xml
+++ b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/pom.xml
@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.9</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	
+
 	<groupId>com.luv2code.springboot</groupId>
 	<artifactId>employee-crud-demo</artifactId>
 	<version>1.0.0</version>
-	
+
 	<properties>
-		<java.version>17</java.version>
+		<java.version>25</java.version>
 	</properties>
 
 	<dependencyManagement>
@@ -23,7 +23,7 @@
 			<dependency>
 				<groupId>io.awspring.cloud</groupId>
 				<artifactId>spring-cloud-aws-dependencies</artifactId>
-				<version>3.1.0</version>
+				<version>4.0.0-M1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -54,7 +54,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 
 		<dependency>
@@ -66,7 +66,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/01-create-user.sql b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/01-create-user.sql
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/01-create-user.sql
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/01-create-user.sql
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/02-employee-directory.sql b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/02-employee-directory.sql
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/02-employee-directory.sql
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/sql-scripts/02-employee-directory.sql
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplication.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/config/DemoConfig.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/config/DemoConfig.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/config/DemoConfig.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/config/DemoConfig.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/controller/EmployeeController.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/EmployeeRepository.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAO.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAO.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAO.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAO.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAOImpl.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAOImpl.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAOImpl.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/dao/RefreshDAOImpl.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/entity/Employee.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeService.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/EmployeeServiceImpl.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/RefreshService.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/RefreshService.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/RefreshService.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/java/com/luv2code/springboot/thymeleafdemo/service/RefreshService.java
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application-prod.properties b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application-prod.properties
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application-prod.properties
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application-prod.properties
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application.properties b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application.properties
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application.properties
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/application.properties
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/css/styles.css b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/css/styles.css
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/css/styles.css
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/css/styles.css
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/index.html b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/index.html
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/index.html
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/static/index.html
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/employee-form.html b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/employee-form.html
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/employee-form.html
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/employee-form.html
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/list-employees.html b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/list-employees.html
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/list-employees.html
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/main/resources/templates/employees/list-employees.html
diff --git a/06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java b/06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
similarity index 100%
rename from 06-bonus-spring-boot-3-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java
rename to 06-bonus-spring-boot-spring-mvc-crud-aws-environment-variables-encrypted-with-data-refresher/src/test/java/com/luv2code/springboot/thymeleafdemo/ThymeleafdemoApplicationTests.java