diff --git a/sdk/boms/azure-spring-boot-bom/pom.xml b/sdk/boms/azure-spring-boot-bom/pom.xml
deleted file mode 100644
index 742f971d68baf..0000000000000
--- a/sdk/boms/azure-spring-boot-bom/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.azure.spring</groupId>
-  <artifactId>azure-spring-boot-bom</artifactId>
-  <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-bom;current} -->
-  <packaging>pom</packaging>
-
-  <name>Azure Spring Boot BOM</name>
-  <description>BOM for Microsoft Azure Spring Boot Support</description>
-  <url>https://github.com/Azure/azure-sdk-for-java</url>
-
-  <licenses>
-    <license>
-      <name>The MIT License (MIT)</name>
-      <url>http://opensource.org/licenses/MIT</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>microsoft</id>
-      <name>Microsoft Corporation</name>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:git:git://github.com/azure/azure-sdk-for-java</connection>
-    <developerConnection>scm:git:git://github.com/azure/azure-sdk-for-java</developerConnection>
-    <url>https://github.com/azure/azure-sdk-for-java</url>
-  </scm>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
-    <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    <azure.spring.data.cosmos.version>3.13.0</azure.spring.data.cosmos.version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
-  </properties>
-
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/azure/azure-sdk-for-java/issues</url>
-  </issueManagement>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.azure</groupId>
-        <artifactId>azure-sdk-bom</artifactId>
-        <version>1.0.4</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <!-- Azure Dependencies Bom -->
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-cloud-starter</artifactId>
-        <version>${azure.spring.boot.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-active-directory</artifactId>
-        <version>${azure.spring.boot.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-cosmos</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-servicebus-jms</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-boot-starter-storage</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.azure</groupId>
-        <artifactId>azure-spring-data-cosmos</artifactId>
-        <version>${azure.spring.data.cosmos.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <!-- Copy the pom file to output -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8
-        </version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <copy file="${project.pomFile}" tofile="${packageOutputDirectory}/${project.build.finalName}.pom"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/sdk/boms/ci.yml b/sdk/boms/ci.yml
index 55a2b884075bb..ddf204427af32 100644
--- a/sdk/boms/ci.yml
+++ b/sdk/boms/ci.yml
@@ -29,12 +29,9 @@ extends:
       - name: azure-sdk-bom
         groupId: com.azure
         safeName: azuresdkbom
-      - name: azure-spring-boot-bom
+      - name: spring-cloud-azure-dependencies
         groupID: com.azure.spring
-        safeName: azurespringbootbom
-      - name: azure-spring-cloud-dependencies
-        groupID: com.azure.spring
-        safeName: azurespringclouddependencies
+        safeName: springcloudazuredependencies
       - name: azure-sdk-template-bom
         groupID: com.azure
         safeName: azuresdktemplatebom
diff --git a/sdk/boms/pom.xml b/sdk/boms/pom.xml
index 13dbc73585608..1992586baaea9 100644
--- a/sdk/boms/pom.xml
+++ b/sdk/boms/pom.xml
@@ -11,7 +11,6 @@
   <modules>
     <module>azure-sdk-bom</module>
     <module>azure-sdk-template-bom</module>
-    <module>azure-spring-boot-bom</module>
-    <module>azure-spring-cloud-dependencies</module>
+    <module>spring-cloud-azure-dependencies</module>
   </modules>
 </project>
diff --git a/sdk/boms/azure-spring-cloud-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml
similarity index 62%
rename from sdk/boms/azure-spring-cloud-dependencies/pom.xml
rename to sdk/boms/spring-cloud-azure-dependencies/pom.xml
index 23fc5ca123934..8a2f0a6d95c89 100644
--- a/sdk/boms/azure-spring-cloud-dependencies/pom.xml
+++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml
@@ -5,12 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.azure.spring</groupId>
-  <artifactId>azure-spring-cloud-dependencies</artifactId>
+  <artifactId>spring-cloud-azure-dependencies</artifactId>
   <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-dependencies;current} -->
   <packaging>pom</packaging>
 
-  <name>Azure Spring Cloud Dependencies</name>
-  <description>Azure spring cloud dependencies</description>
+  <name>Spring Cloud Azure Dependencies</name>
+  <description>Spring Cloud Azure Dependencies</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -44,9 +44,9 @@
     <packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
     <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
     <azure.resourcemanager.version>2.8.0</azure.resourcemanager.version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
-    <azure.spring.appconfigure.version>2.1.1</azure.spring.appconfigure.version>
-    <azure.spring.appconfigure.starter.version>2.1.1</azure.spring.appconfigure.starter.version>
-    <azure.spring.appconfigure.feature.management.version>2.0.1</azure.spring.appconfigure.feature.management.version>
+    <appconfigure.version>2.1.1</appconfigure.version>
+    <appconfigure.starter.version>2.1.1</appconfigure.starter.version>
+    <appconfigure.feature.management.version>2.0.1</appconfigure.feature.management.version>
   </properties>
 
   <dependencyManagement>
@@ -58,7 +58,35 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- Azure Spring Integration -->
+      
+      <!-- Spring Messaging Azure -->
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-messaging-azure</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-messaging-azure-eventhubs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-messaging-azure-servicebus</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-messaging-azure-storage-queue</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <!-- Spring Integration Azure-->
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-integration-azure-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-integration-eventhubs</artifactId>
@@ -75,75 +103,101 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- Azure Spring Cloud-->
+      <!-- Spring Cloud Azure -->
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-cloud-core</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-core</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-messaging</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-resourcemanager</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-eventhubs</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-actuator</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-servicebus</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-autoconfigure</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-storage-queue</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-actuator-autoconfigure</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+        <artifactId>spring-cloud-azure-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-messaging</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-starter-active-directory</artifactId>
+        <version>${project.version}</version>
       </dependency>
-
-      <!-- Azure Spring Cloud Stream Binder -->
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-eventhubs</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-starter-actuator</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-eventhubs-core</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-starter-cache</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-servicebus-topic</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-starter-cosmos</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-stream-binder-servicebus-queue</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-starter-eventhubs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-eventhubs-kafka</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-keyvault-certificates</artifactId>
+        <version>${project.version}</version>
       </dependency>
-
-      <!--Spring Cloud Azure Starters-->
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>azure-spring-cloud-starter-cache</artifactId>
+        <artifactId>spring-cloud-azure-starter-keyvault-secrets</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-starter-servicebus</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-servicebus-jms</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-storage</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-storage-queue</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-stream-eventhubs</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
@@ -155,52 +209,60 @@
         <artifactId>spring-cloud-azure-starter-stream-servicebus-topic</artifactId>
         <version>${project.version}</version>
       </dependency>
+
+      <!-- Azure Spring Cloud Stream Binder -->
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-eventhubs</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-stream-binder-eventhubs</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-stream-eventhubs</artifactId>
+        <artifactId>spring-cloud-azure-stream-binder-eventhubs-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-eventhubs-kafka</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-stream-binder-servicebus-core</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
-        <artifactId>spring-cloud-azure-starter-storage-queue</artifactId>
-        <version>${azure.spring.cloud.version}</version>
+        <artifactId>spring-cloud-azure-stream-binder-servicebus-topic</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-stream-binder-servicebus-queue</artifactId>
+        <version>${project.version}</version>
       </dependency>
 
+
       <!-- App Configuration -->
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-cloud-appconfiguration-config</artifactId>
-        <version>${azure.spring.appconfigure.version}</version>
+        <version>${appconfigure.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-cloud-appconfiguration-config-web</artifactId>
-        <version>${azure.spring.appconfigure.version}</version>
+        <version>${appconfigure.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-cloud-feature-management-web</artifactId>
-        <version>${azure.spring.appconfigure.feature.management.version}</version>
+        <version>${appconfigure.feature.management.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-cloud-feature-management</artifactId>
-        <version>${azure.spring.appconfigure.feature.management.version}</version>
+        <version>${appconfigure.feature.management.version}</version>
       </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-cloud-starter-appconfiguration-config</artifactId>
-        <version>${azure.spring.appconfigure.starter.version}</version>
+        <version>${appconfigure.starter.version}</version>
       </dependency>
 
       <!--Azure SDK-->