diff --git a/pom.xml b/pom.xml
index 89c030428d20..5c5d92308a1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,7 +640,6 @@
                 <module>apollo</module>
                 <module>atomix</module>
                 <module>aws-modules</module>
-                <module>spring-boot-azure-deployment</module>
                 <module>azure-functions</module>
                 <module>bazel</module>
                 <module>checker-framework</module>
@@ -665,7 +664,6 @@
                 <module>grpc</module>
                 <module>guava-modules</module>
                 <module>hazelcast</module>
-                <module>spring-boot-heroku-deployment</module>
                 <module>httpclient-simple</module>
                 <module>hystrix</module>
                 <module>image-compression</module>
@@ -1082,7 +1080,6 @@
                 <module>apache-velocity</module>
                 <module>atomix</module>
                 <module>aws-modules</module>
-                <module>spring-boot-azure-deployment</module>
                 <module>azure-functions</module>
                 <module>bazel</module>
                 <module>checker-framework</module>
@@ -1107,7 +1104,6 @@
                 <module>grpc</module>
                 <module>guava-modules</module>
                 <module>hazelcast</module>
-                <module>spring-boot-heroku-deployment</module>
                 <module>httpclient-simple</module>
                 <module>hystrix</module>
                 <module>image-compression</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 655bcb67cf26..1e833feb9929 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -133,6 +133,8 @@
         <module>spring-boot-brave</module>
         <module>spring-boot-simple</module>
         <module>spring-boot-http2</module>
+        <module>spring-boot-azure-deployment</module>
+        <module>spring-boot-heroku-deployment</module>
     </modules>
 
     <build>
diff --git a/spring-boot-azure-deployment/.gitignore b/spring-boot-modules/spring-boot-azure-deployment/.gitignore
similarity index 100%
rename from spring-boot-azure-deployment/.gitignore
rename to spring-boot-modules/spring-boot-azure-deployment/.gitignore
diff --git a/spring-boot-azure-deployment/docker/Dockerfile b/spring-boot-modules/spring-boot-azure-deployment/docker/Dockerfile
similarity index 100%
rename from spring-boot-azure-deployment/docker/Dockerfile
rename to spring-boot-modules/spring-boot-azure-deployment/docker/Dockerfile
diff --git a/spring-boot-azure-deployment/pom.xml b/spring-boot-modules/spring-boot-azure-deployment/pom.xml
similarity index 100%
rename from spring-boot-azure-deployment/pom.xml
rename to spring-boot-modules/spring-boot-azure-deployment/pom.xml
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/AzureApplication.java b/spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/AzureApplication.java
similarity index 100%
rename from spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/AzureApplication.java
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/AzureApplication.java
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/TestController.java b/spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/TestController.java
similarity index 100%
rename from spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/TestController.java
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/TestController.java
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java b/spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
similarity index 100%
rename from spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/UserRepository.java b/spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/UserRepository.java
similarity index 100%
rename from spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/UserRepository.java
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/UserRepository.java
diff --git a/spring-boot-azure-deployment/src/main/resources/application.properties b/spring-boot-modules/spring-boot-azure-deployment/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-azure-deployment/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/resources/application.properties
diff --git a/spring-boot-azure-deployment/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-azure-deployment/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-azure-deployment/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-azure-deployment/src/main/resources/logback.xml
diff --git a/spring-boot-azure-deployment/src/test/java/com/baeldung/springboot/azure/AzureApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-azure-deployment/src/test/java/com/baeldung/springboot/azure/AzureApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-azure-deployment/src/test/java/com/baeldung/springboot/azure/AzureApplicationIntegrationTest.java
rename to spring-boot-modules/spring-boot-azure-deployment/src/test/java/com/baeldung/springboot/azure/AzureApplicationIntegrationTest.java
diff --git a/spring-boot-heroku-deployment/.gitlab-ci.yml b/spring-boot-modules/spring-boot-heroku-deployment/.gitlab-ci.yml
similarity index 100%
rename from spring-boot-heroku-deployment/.gitlab-ci.yml
rename to spring-boot-modules/spring-boot-heroku-deployment/.gitlab-ci.yml
diff --git a/spring-boot-heroku-deployment/Dockerfile b/spring-boot-modules/spring-boot-heroku-deployment/Dockerfile
similarity index 100%
rename from spring-boot-heroku-deployment/Dockerfile
rename to spring-boot-modules/spring-boot-heroku-deployment/Dockerfile
diff --git a/spring-boot-heroku-deployment/Procfile b/spring-boot-modules/spring-boot-heroku-deployment/Procfile
similarity index 100%
rename from spring-boot-heroku-deployment/Procfile
rename to spring-boot-modules/spring-boot-heroku-deployment/Procfile
diff --git a/spring-boot-heroku-deployment/pom.xml b/spring-boot-modules/spring-boot-heroku-deployment/pom.xml
similarity index 100%
rename from spring-boot-heroku-deployment/pom.xml
rename to spring-boot-modules/spring-boot-heroku-deployment/pom.xml
diff --git a/spring-boot-heroku-deployment/src/main/java/com/baeldung/heroku/Main.java b/spring-boot-modules/spring-boot-heroku-deployment/src/main/java/com/baeldung/heroku/Main.java
similarity index 100%
rename from spring-boot-heroku-deployment/src/main/java/com/baeldung/heroku/Main.java
rename to spring-boot-modules/spring-boot-heroku-deployment/src/main/java/com/baeldung/heroku/Main.java
diff --git a/spring-boot-heroku-deployment/src/main/resources/application.properties b/spring-boot-modules/spring-boot-heroku-deployment/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-heroku-deployment/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-heroku-deployment/src/main/resources/application.properties
diff --git a/spring-boot-heroku-deployment/system.properties b/spring-boot-modules/spring-boot-heroku-deployment/system.properties
similarity index 100%
rename from spring-boot-heroku-deployment/system.properties
rename to spring-boot-modules/spring-boot-heroku-deployment/system.properties