diff --git a/sdk/spring/azure-spring-boot-bom/pom.xml b/sdk/boms/azure-spring-boot-bom/pom.xml
similarity index 100%
rename from sdk/spring/azure-spring-boot-bom/pom.xml
rename to sdk/boms/azure-spring-boot-bom/pom.xml
diff --git a/sdk/boms/ci.yml b/sdk/boms/ci.yml
index 6db7700c6902..93d58b88cee8 100644
--- a/sdk/boms/ci.yml
+++ b/sdk/boms/ci.yml
@@ -40,3 +40,6 @@ stages:
         - name: azure-sdk-bom
           groupId: com.azure
           safeName: azuresdkbom
+        - name: azure-spring-boot-bom
+          groupID: com.microsoft.azure
+          safeName: azurespringbootbom
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml
index 1bcc0411b772..0534c1a707ff 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml
@@ -21,6 +21,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+            <version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
         </dependency>
 
         <dependency>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml
index 4a21bf72e586..b6dbbfcd8a32 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml
@@ -21,6 +21,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+            <version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
         </dependency>
 
         <dependency>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml
index cda76e65383e..b86e3af75b79 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml
@@ -23,6 +23,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+            <version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
         </dependency>
 
         <dependency>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml
index 81f942376fc0..1efff6e3fbd2 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml
@@ -21,6 +21,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+      <version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/pom.xml b/sdk/spring/azure-spring-boot-samples/pom.xml
index 937f0d61b2d0..4e2e4bdae9d8 100644
--- a/sdk/spring/azure-spring-boot-samples/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/pom.xml
@@ -52,23 +52,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-spring-boot-bom</artifactId>
-        <version>2.2.5-beta.1</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.3</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
     <plugins>
       <plugin>