diff --git a/spring-cloud-modules/spring-cloud-eureka/pom.xml b/spring-cloud-modules/spring-cloud-eureka/pom.xml
index 686ca4f0e91c..61335ae3f859 100644
--- a/spring-cloud-modules/spring-cloud-eureka/pom.xml
+++ b/spring-cloud-modules/spring-cloud-eureka/pom.xml
@@ -22,6 +22,8 @@
         <module>spring-cloud-eureka-feign-client</module>
         <module>spring-cloud-eureka-feign-client-integration-test</module>
         <module>spring-cloud-eureka-server</module>
+        <module>spring-cloud-eureka-server2</module>
+        <module>spring-cloud-eureka-client2</module>
     </modules>
 
     <properties>
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/pom.xml
similarity index 87%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/pom.xml
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/pom.xml
index 7ccf8b3b4f21..ae62e6848e91 100644
--- a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/pom.xml
+++ b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/pom.xml
@@ -2,22 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
-        <relativePath/>
-    </parent>
     <groupId>com.baeldung</groupId>
-    <artifactId>eurekaClient</artifactId>
+    <artifactId>spring-cloud-eureka-client2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>eurekaClient</name>
+    <name>spring-cloud-eureka-client2</name>
     <description>Demo project for Eureka Client</description>
-    <url/>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-cloud-eureka</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
         <java.version>17</java.version>
         <spring-cloud.version>2022.0.0</spring-cloud.version>
     </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -33,6 +34,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/java/com/baeldung/eurekaclient/Controller.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/java/com/baeldung/eurekaclient/Controller.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/java/com/baeldung/eurekaclient/Controller.java
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/java/com/baeldung/eurekaclient/Controller.java
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/java/com/baeldung/eurekaclient/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/java/com/baeldung/eurekaclient/EurekaClientApplication.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/java/com/baeldung/eurekaclient/EurekaClientApplication.java
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/java/com/baeldung/eurekaclient/EurekaClientApplication.java
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/main/resources/application.properties
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/main/resources/application.properties
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/test/java/com/baeldung/eurekaclient/EurekaClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/test/java/com/baeldung/eurekaclient/EurekaClientIntegrationTest.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/eureka-client/src/test/java/com/baeldung/eurekaclient/EurekaClientIntegrationTest.java
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client2/src/test/java/com/baeldung/eurekaclient/EurekaClientIntegrationTest.java
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/pom.xml
similarity index 87%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/pom.xml
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/pom.xml
index 55f6a33da19d..da45d581c3db 100644
--- a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/pom.xml
@@ -2,22 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.3</version>
-        <relativePath/>
-    </parent>
     <groupId>com.baeldung</groupId>
-    <artifactId>eurekaServer</artifactId>
+    <artifactId>spring-cloud-eureka-server2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>eurekaServer</name>
+    <name>spring-cloud-eureka-server2</name>
     <description>Demo project for Eureka Server</description>
-    <url/>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-cloud-eureka</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
         <java.version>17</java.version>
         <spring-cloud.version>2024.0.0</spring-cloud.version>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -33,6 +34,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/main/java/com/baeldung/eurekaserver/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/main/java/com/baeldung/eurekaserver/EurekaServerApplication.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/main/java/com/baeldung/eurekaserver/EurekaServerApplication.java
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/main/java/com/baeldung/eurekaserver/EurekaServerApplication.java
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/main/resources/application.properties
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/main/resources/application.properties
diff --git a/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/test/java/com/baeldung/eurekaserver/EurekaServerIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/test/java/com/baeldung/eurekaserver/EurekaServerIntegrationTest.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/eureka-server/src/test/java/com/baeldung/eurekaserver/EurekaServerIntegrationTest.java
rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server2/src/test/java/com/baeldung/eurekaserver/EurekaServerIntegrationTest.java