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-remoting-modules/pom.xml b/spring-remoting-modules/pom.xml
index 108c276e762a..6b91daf9436b 100644
--- a/spring-remoting-modules/pom.xml
+++ b/spring-remoting-modules/pom.xml
@@ -26,6 +26,8 @@
         <module>remoting-amqp</module>
         <module>remoting-jms</module>
         <module>remoting-rmi</module>
+        <module>spring-boot-azure-deployment</module>
+        <module>spring-boot-heroku-deployment</module>
     </modules>
 
     <dependencyManagement>
diff --git a/spring-boot-azure-deployment/.gitignore b/spring-remoting-modules/spring-boot-azure-deployment/.gitignore
similarity index 100%
rename from spring-boot-azure-deployment/.gitignore
rename to spring-remoting-modules/spring-boot-azure-deployment/.gitignore
diff --git a/spring-boot-azure-deployment/docker/Dockerfile b/spring-remoting-modules/spring-boot-azure-deployment/docker/Dockerfile
similarity index 100%
rename from spring-boot-azure-deployment/docker/Dockerfile
rename to spring-remoting-modules/spring-boot-azure-deployment/docker/Dockerfile
diff --git a/spring-boot-azure-deployment/pom.xml b/spring-remoting-modules/spring-boot-azure-deployment/pom.xml
similarity index 96%
rename from spring-boot-azure-deployment/pom.xml
rename to spring-remoting-modules/spring-boot-azure-deployment/pom.xml
index 1eeb598a1d10..aa88d2c94965 100644
--- a/spring-boot-azure-deployment/pom.xml
+++ b/spring-remoting-modules/spring-boot-azure-deployment/pom.xml
@@ -11,9 +11,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-3</relativePath>
+        <artifactId>spring-remoting-modules</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -51,7 +50,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>{docker-maven-plugin.version}</version>
+                <version>${docker-maven-plugin.version}</version>
                 <configuration>
                     <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
                     <registryUrl>https://${docker.image.prefix}</registryUrl>
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/AzureApplication.java b/spring-remoting-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-remoting-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-remoting-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-remoting-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-remoting-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
similarity index 80%
rename from spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
rename to spring-remoting-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
index d1fbae744750..0f60688f5a2e 100644
--- a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
+++ b/spring-remoting-modules/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/User.java
@@ -1,9 +1,9 @@
 package com.baeldung.springboot.azure;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 
 /**
  * @author aiet
diff --git a/spring-boot-azure-deployment/src/main/java/com/baeldung/springboot/azure/UserRepository.java b/spring-remoting-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-remoting-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-remoting-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-remoting-modules/spring-boot-azure-deployment/src/main/resources/application.properties
diff --git a/spring-boot-azure-deployment/src/main/resources/logback.xml b/spring-remoting-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-remoting-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-remoting-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-remoting-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-remoting-modules/spring-boot-heroku-deployment/.gitlab-ci.yml
similarity index 100%
rename from spring-boot-heroku-deployment/.gitlab-ci.yml
rename to spring-remoting-modules/spring-boot-heroku-deployment/.gitlab-ci.yml
diff --git a/spring-boot-heroku-deployment/Dockerfile b/spring-remoting-modules/spring-boot-heroku-deployment/Dockerfile
similarity index 100%
rename from spring-boot-heroku-deployment/Dockerfile
rename to spring-remoting-modules/spring-boot-heroku-deployment/Dockerfile
diff --git a/spring-boot-heroku-deployment/Procfile b/spring-remoting-modules/spring-boot-heroku-deployment/Procfile
similarity index 100%
rename from spring-boot-heroku-deployment/Procfile
rename to spring-remoting-modules/spring-boot-heroku-deployment/Procfile
diff --git a/spring-boot-heroku-deployment/pom.xml b/spring-remoting-modules/spring-boot-heroku-deployment/pom.xml
similarity index 100%
rename from spring-boot-heroku-deployment/pom.xml
rename to spring-remoting-modules/spring-boot-heroku-deployment/pom.xml
diff --git a/spring-boot-heroku-deployment/src/main/java/com/baeldung/heroku/Main.java b/spring-remoting-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-remoting-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-remoting-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-remoting-modules/spring-boot-heroku-deployment/src/main/resources/application.properties
diff --git a/spring-boot-heroku-deployment/system.properties b/spring-remoting-modules/spring-boot-heroku-deployment/system.properties
similarity index 100%
rename from spring-boot-heroku-deployment/system.properties
rename to spring-remoting-modules/spring-boot-heroku-deployment/system.properties