diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index c90f1bbdc442..277a78335fb1 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -50,6 +50,10 @@ com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-storage-queue;12.6.0-beta.1;12.6.0-beta.2
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
+com.azure:azure-spring-boot-test-aad;1.0.0;1.0.0
+com.azure:azure-spring-boot-test-core;1.0.0;1.0.0
+com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
+com.azure:azure-spring-boot-test-keyvault;1.0.0;1.0.0
 com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1
@@ -59,8 +63,7 @@ com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
-com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1
-com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1
+com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1
 
 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
 # version. Unreleased dependencies are only valid for dependency versions.
diff --git a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
index 6e2c7a1dae7e..6bf68ed712aa 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
@@ -4,13 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-cloud-foundry-service-sample</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
   <name>Azure Cloud Foundry Service Sample</name>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
index ec15c4c34ddc..b3773beca50a 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
@@ -4,16 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-active-directory-b2c-oidc</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure AD B2C Spring Security 5 OAuth2 Integration Spring Boot Sample</name>
+  <name>Azure Spring Boot Starter Sample - Azure AD B2C Spring Security 5 OAuth Integration</name>
   <description>Azure AD B2C Spring Security 5 OAuth2 Integration Spring Boot Sample</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
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 cbd0d92c837d..ebb1c722b568 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
@@ -1,54 +1,55 @@
 <?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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-spring-boot-samples</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
+  </parent>
 
-    <artifactId>azure-spring-boot-sample-active-directory-backend-v2</artifactId>
-    <packaging>jar</packaging>
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-boot-sample-active-directory-backend-v2</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
 
-    <name>Azure AD Spring Security 5 OAuth2 V2 Integration Spring Boot Sample</name>
-    <description>Azure AD Spring Security 5 OAuth2 V2 Integration Spring Boot Sample</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  <name>Azure Spring Boot Starter Sample - Azure AD Spring Security Integration v2</name>
+  <description>Azure AD Spring Security 5 OAuth2 V2 Integration Spring Boot Sample</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-active-directory-spring-boot-starter</artifactId>
-            <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-thymeleaf</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-jose</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>
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 292780bbe355..408b7867beb2 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
@@ -1,54 +1,55 @@
 <?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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-spring-boot-samples</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
+  </parent>
 
-    <artifactId>azure-spring-boot-sample-active-directory-backend</artifactId>
-    <packaging>jar</packaging>
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-boot-sample-active-directory-backend</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
 
-    <name>Azure AD Spring Security 5 OAuth2 Integration Spring Boot Sample</name>
-    <description>Azure AD Spring Security 5 OAuth2 Integration Spring Boot Sample</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  <name>Azure Spring Boot Starter Sample - Azure AD Spring Security Integration</name>
+  <description>Azure AD Spring Security 5 OAuth2 Integration Spring Boot Sample</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-active-directory-spring-boot-starter</artifactId>
-            <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-thymeleaf</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-jose</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>
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 1a82a9d4b10d..22a4296737c9 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
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-spring-boot-samples</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-
-    <artifactId>azure-spring-boot-sample-active-directory-stateless</artifactId>
-
-    <name>Azure AD Stateless Spring Security Integration Spring Boot Sample</name>
-    <description>Sample project using the AAD stateless app-role filter for AAD integration in Spring Security</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-active-directory-spring-boot-starter</artifactId>
-            <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
-        </dependency>
-    </dependencies>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>
+
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
+  </parent>
+
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-boot-sample-active-directory-stateless</artifactId>
+  <version>1.0.0</version>
+
+  <name>Azure Spring Boot Starter Sample - Azure AD Stateless Spring Security Integration</name>
+  <description>Sample project using the AAD stateless app-role filter for AAD integration in Spring Security</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>azure-active-directory-spring-boot-starter</artifactId>
+      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-jose</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>
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 042fec4e4c15..4e49e9dfcd79 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
@@ -4,16 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-active-directory</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure AD Spring Security Integration Spring Boot Sample</name>
+  <name>Azure Spring Boot Starter Sample - Azure AD Spring Security Integration</name>
   <description>Azure AD Spring Security Integration Spring Boot Sample</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml
index e9b6195ab0ae..fe8405d77d90 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml
@@ -4,16 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-cosmosdb</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Cosmos DB Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Cosmos DB</name>
   <description>Sample project for Azure Document DB Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml
index fdf7507fa6e9..82ab68f45fd5 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-data-gremlin</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Spring Data Gremlin Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Spring Data Gremlin</name>
   <description>Sample project for Spring Data Gremlin</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml
index a07a10824903..3123c4636f23 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-keyvault-secrets</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Key Vault Secrets Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Key Vault Secrets</name>
   <description>Sample project for Azure Key Vault Secrets Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml
index 42635de23369..48c552e78504 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-mediaservices</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Media Services Spring Boot Sample</name>
+  <name>Azure Spring Boot Starter Sample - Media Services</name>
   <description>Sample project for Azure Media Services</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml
index b6854172191e..82d3a20f5053 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-servicebus-jms-queue</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Service Bus JMS Queue Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Service Bus JMS Queue</name>
   <description>Sample project for Spring Boot Service Bus JMS Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml
index ea0698400c45..ee5c4289fe4a 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-servicebus-jms-topic</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Service Bus JMS Topic Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Service Bus JMS Topic</name>
   <description>Sample project for Spring Boot Service Bus JMS Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml
index 09d6653d555e..76529026d881 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-servicebus</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Service Bus Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Service Bus</name>
   <description>Sample project for Spring Boot Service Bus Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-blob/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-blob/pom.xml
index edc525785e1b..da8a272d062d 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-blob/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-blob/pom.xml
@@ -5,16 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>azure-spring-boot-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
   </parent>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-sample-storage-blob</artifactId>
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>Azure Storage Spring Boot Starter Sample</name>
+  <name>Azure Spring Boot Starter Sample - Storage Blob</name>
   <description>Sample project for Azure Storage Starter</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
diff --git a/sdk/spring/azure-spring-boot-samples/pom.xml b/sdk/spring/azure-spring-boot-samples/pom.xml
deleted file mode 100644
index 5f201b3fa860..000000000000
--- a/sdk/spring/azure-spring-boot-samples/pom.xml
+++ /dev/null
@@ -1,81 +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>
-
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
-    <relativePath/> <!-- lookup parent from repository -->
-  </parent>
-
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>azure-spring-boot-samples</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version>
-
-  <name>Azure Spring Boot Samples</name>
-  <description>Samples for Azure Spring Boot</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>
-
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/azure/azure-sdk-for-java/issues</url>
-  </issueManagement>
-
-  <properties>
-    <java.version>1.8</java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <modules>
-    <module>azure-spring-boot-sample-active-directory</module>
-    <module>azure-spring-boot-sample-active-directory-b2c-oidc</module>
-    <module>azure-spring-boot-sample-active-directory-backend</module>
-    <module>azure-spring-boot-sample-active-directory-backend-v2</module>
-    <module>azure-spring-boot-sample-active-directory-stateless</module>
-    <module>azure-spring-boot-sample-cosmosdb</module>
-    <module>azure-spring-boot-sample-data-gremlin</module>
-    <module>azure-spring-boot-sample-keyvault-secrets</module>
-    <module>azure-spring-boot-sample-mediaservices</module>
-    <module>azure-spring-boot-sample-servicebus</module>
-    <module>azure-spring-boot-sample-servicebus-jms-queue</module>
-    <module>azure-spring-boot-sample-servicebus-jms-topic</module>
-    <module>azure-spring-boot-sample-storage-blob</module>
-    <module>azure-cloud-foundry-service-sample</module>
-  </modules>
-
-</project>
diff --git a/sdk/spring/azure-spring-boot-test-aad/README.md b/sdk/spring/azure-spring-boot-test-aad/README.md
new file mode 100644
index 000000000000..a20e9ce11abe
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-aad/README.md
@@ -0,0 +1,9 @@
+# Azure Spring Boot Integration tests client library for Java
+
+## Key concepts
+## Getting started
+## Key concepts
+## Examples
+## Troubleshooting
+## Next steps
+## Contributing
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-test-aad/pom.xml
similarity index 77%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml
rename to sdk/spring/azure-spring-boot-test-aad/pom.xml
index 4685339f2b04..f263520b730b 100644
--- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad/pom.xml
@@ -3,20 +3,22 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>azure-spring-boot-tests</artifactId>
-    <groupId>com.microsoft.azure</groupId>
-    <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-tests;current} -->
-    <relativePath>../pom.xml</relativePath>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-client-sdk-parent</artifactId>
+    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-test-aad</artifactId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-aad;current} -->
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
+      <groupId>com.azure</groupId>
       <artifactId>azure-spring-boot-test-core</artifactId>
-      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-test-core;current} -->
+      <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -31,6 +33,10 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <skipSpringITs>true</skipSpringITs>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -41,6 +47,7 @@
           <rules>
             <bannedDependencies>
               <includes>
+                <include>com.azure:*</include>
                 <include>com.microsoft.azure:*</include>
                 <include>org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
               </includes>
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/approle/AADAppRoleStatelessAuthenticationFilterIT.java b/sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/approle/AADAppRoleStatelessAuthenticationFilterIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/approle/AADAppRoleStatelessAuthenticationFilterIT.java
rename to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/approle/AADAppRoleStatelessAuthenticationFilterIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/group/AADAuthenticationFilterIT.java b/sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/group/AADAuthenticationFilterIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/group/AADAuthenticationFilterIT.java
rename to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/aad/group/AADAuthenticationFilterIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthResponse.java b/sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthResponse.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthResponse.java
rename to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthResponse.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthUtils.java b/sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthUtils.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthUtils.java
rename to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/oauth/OAuthUtils.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-test-application/pom.xml
similarity index 86%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml
rename to sdk/spring/azure-spring-boot-test-application/pom.xml
index 0027764d24c2..3eea8727fc7d 100644
--- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-application/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-test-application</artifactId>
-  <version>1.0.0</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-test-application;current} -->
+  <version>1.0.0</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -25,13 +25,11 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/config/IncreaseStartupTimeHelper.java b/sdk/spring/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/config/IncreaseStartupTimeHelper.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/config/IncreaseStartupTimeHelper.java
rename to sdk/spring/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/config/IncreaseStartupTimeHelper.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/test/Application.java b/sdk/spring/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/test/Application.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/test/Application.java
rename to sdk/spring/azure-spring-boot-test-application/src/main/java/com/microsoft/azure/test/Application.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-test-application/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-test-application/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/resources/assembly/zip.xml b/sdk/spring/azure-spring-boot-test-application/src/main/resources/assembly/zip.xml
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/src/main/resources/assembly/zip.xml
rename to sdk/spring/azure-spring-boot-test-application/src/main/resources/assembly/zip.xml
diff --git a/sdk/spring/azure-spring-boot-test-core/README.md b/sdk/spring/azure-spring-boot-test-core/README.md
new file mode 100644
index 000000000000..a20e9ce11abe
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-core/README.md
@@ -0,0 +1,9 @@
+# Azure Spring Boot Integration tests client library for Java
+
+## Key concepts
+## Getting started
+## Key concepts
+## Examples
+## Troubleshooting
+## Next steps
+## Contributing
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-test-core/pom.xml
similarity index 81%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml
rename to sdk/spring/azure-spring-boot-test-core/pom.xml
index 5acfaf3cb63b..1752fd094fcd 100644
--- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-core/pom.xml
@@ -3,14 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>azure-spring-boot-tests</artifactId>
-    <groupId>com.microsoft.azure</groupId>
-    <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-tests;current} -->
-    <relativePath>../pom.xml</relativePath>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-client-sdk-parent</artifactId>
+    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-test-core</artifactId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-core;current} -->
   <packaging>jar</packaging>
 
   <dependencies>
@@ -95,14 +97,14 @@
               <includes>
                 <include>com.azure:*</include>
                 <include>com.microsoft.azure:*</include>
-                <include>com.jcraft:jsch:[0.1.53]</include>
-                <include>com.github.cverges.expect4j:expect4j:[1.6]</include>
-                <include>org.apache.maven:maven-embedder:[3.6.2]</include>
-                <include>org.apache.maven:maven-compat:[3.6.2]</include>
-                <include>org.apache.maven.wagon:wagon-http:[3.3.4]</include>
-                <include>org.apache.maven.wagon:wagon-provider-api:[3.3.4]</include>
-                <include>org.eclipse.aether:aether-connector-basic:[1.1.0]</include>
-                <include>org.eclipse.aether:aether-transport-wagon:[1.1.0]</include>
+                <include>com.jcraft:jsch:[0.1.53]</include> <!-- {x-include-update;com.jcraft:jsch;external_dependency} -->
+                <include>com.github.cverges.expect4j:expect4j:[1.6]</include> <!-- {x-include-update;com.github.cverges.expect4j:expect4j;external_dependency} -->
+                <include>org.apache.maven:maven-embedder:[3.6.2]</include> <!-- {x-include-update;org.apache.maven:maven-embedder;external_dependency} -->
+                <include>org.apache.maven:maven-compat:[3.6.2]</include> <!-- {x-include-update;org.apache.maven:maven-compat;external_dependency} -->
+                <include>org.apache.maven.wagon:wagon-http:[3.3.4]</include> <!-- {x-include-update;org.apache.maven.wagon:wagon-http;external_dependency} -->
+                <include>org.apache.maven.wagon:wagon-provider-api:[3.3.4]</include> <!-- {x-include-update;org.apache.maven.wagon:wagon-provider-api;external_dependency} -->
+                <include>org.eclipse.aether:aether-connector-basic:[1.1.0]</include> <!-- {x-include-update;org.eclipse.aether:aether-connector-basic;external_dependency} -->
+                <include>org.eclipse.aether:aether-transport-wagon:[1.1.0]</include> <!-- {x-include-update;org.eclipse.aether:aether-transport-wagon;external_dependency} -->
                 <include>org.springframework.boot:spring-boot:[2.3.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
                 <include>org.springframework:spring-context:[5.2.6.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
@@ -111,14 +113,6 @@
           </rules>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
-        <configuration>
-          <skipITs>${skipSpringITs}</skipITs>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/Access.java b/sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/Access.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/Access.java
rename to sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/Access.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/ClientSecretAccess.java b/sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/ClientSecretAccess.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/ClientSecretAccess.java
rename to sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/management/ClientSecretAccess.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/AppRunner.java b/sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/AppRunner.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/AppRunner.java
rename to sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/AppRunner.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/MavenBasedProject.java b/sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/MavenBasedProject.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/MavenBasedProject.java
rename to sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/MavenBasedProject.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/SSHShell.java b/sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/SSHShell.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/SSHShell.java
rename to sdk/spring/azure-spring-boot-test-core/src/main/java/com/microsoft/azure/test/utils/SSHShell.java
diff --git a/sdk/spring/azure-spring-boot-test-cosmosdb/README.md b/sdk/spring/azure-spring-boot-test-cosmosdb/README.md
new file mode 100644
index 000000000000..a20e9ce11abe
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-cosmosdb/README.md
@@ -0,0 +1,9 @@
+# Azure Spring Boot Integration tests client library for Java
+
+## Key concepts
+## Getting started
+## Key concepts
+## Examples
+## Troubleshooting
+## Next steps
+## Contributing
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-test-cosmosdb/pom.xml
similarity index 79%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml
rename to sdk/spring/azure-spring-boot-test-cosmosdb/pom.xml
index ca98c2dde5d3..37f3956c8e7a 100644
--- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-cosmosdb/pom.xml
@@ -3,14 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>azure-spring-boot-tests</artifactId>
-    <groupId>com.microsoft.azure</groupId>
-    <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-tests;current} -->
-    <relativePath>../pom.xml</relativePath>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-client-sdk-parent</artifactId>
+    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-test-cosmosdb</artifactId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-cosmosdb;current} -->
 
   <dependencies>
     <dependency>
@@ -19,9 +21,9 @@
       <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmosdb-spring-boot-starter;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
+      <groupId>com.azure</groupId>
       <artifactId>azure-spring-boot-test-core</artifactId>
-      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-test-core;current} -->
+      <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-core;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -31,6 +33,10 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <skipSpringITs>true</skipSpringITs>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/CosmosDBIT.java b/sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/CosmosDBIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/CosmosDBIT.java
rename to sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/CosmosDBIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/DummyApp.java b/sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/DummyApp.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/DummyApp.java
rename to sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/DummyApp.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/User.java b/sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/User.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/User.java
rename to sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/User.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/UserRepository.java b/sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/UserRepository.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/UserRepository.java
rename to sdk/spring/azure-spring-boot-test-cosmosdb/src/test/java/com/microsoft/azure/test/cosmosdb/UserRepository.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/test-resources.json b/sdk/spring/azure-spring-boot-test-cosmosdb/test-resources.json
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/test-resources.json
rename to sdk/spring/azure-spring-boot-test-cosmosdb/test-resources.json
diff --git a/sdk/spring/azure-spring-boot-test-keyvault/README.md b/sdk/spring/azure-spring-boot-test-keyvault/README.md
new file mode 100644
index 000000000000..a20e9ce11abe
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-keyvault/README.md
@@ -0,0 +1,9 @@
+# Azure Spring Boot Integration tests client library for Java
+
+## Key concepts
+## Getting started
+## Key concepts
+## Examples
+## Troubleshooting
+## Next steps
+## Contributing
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml
similarity index 81%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml
rename to sdk/spring/azure-spring-boot-test-keyvault/pom.xml
index 8f413b404d1c..d206c8c9c94b 100644
--- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml
@@ -3,14 +3,16 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>azure-spring-boot-tests</artifactId>
-    <groupId>com.microsoft.azure</groupId>
-    <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-tests;current} -->
-    <relativePath>../pom.xml</relativePath>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-client-sdk-parent</artifactId>
+    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>com.azure</groupId>
   <artifactId>azure-spring-boot-test-keyvault</artifactId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-keyvault;current} -->
 
   <dependencies>
     <dependency>
@@ -35,9 +37,9 @@
       <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
+      <groupId>com.azure</groupId>
       <artifactId>azure-spring-boot-test-core</artifactId>
-      <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-test-core;current} -->
+      <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-boot-test-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -54,9 +56,12 @@
         </exclusion>
       </exclusions>
     </dependency>
-
   </dependencies>
 
+  <properties>
+    <skipSpringITs>true</skipSpringITs>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -67,9 +72,10 @@
           <rules>
             <bannedDependencies>
               <includes>
+                <include>com.azure:*</include>
                 <include>com.microsoft.azure:*</include>
-                <include>org.springframework.boot:spring-boot-starter-actuator:[2.3.0.RELEASE]</include> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
-                <include>org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE]</include> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
+                <include>org.springframework.boot:spring-boot-starter-actuator:[2.3.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
+                <include>org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/ActuatorIT.java b/sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/ActuatorIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/ActuatorIT.java
rename to sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/ActuatorIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/KeyVaultIT.java b/sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/KeyVaultIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/KeyVaultIT.java
rename to sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/KeyVaultIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/MultipleKeyVaultsIT.java b/sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/MultipleKeyVaultsIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/MultipleKeyVaultsIT.java
rename to sdk/spring/azure-spring-boot-test-keyvault/src/test/java/com/microsoft/azure/test/keyvault/MultipleKeyVaultsIT.java
diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/test-resources.json b/sdk/spring/azure-spring-boot-test-keyvault/test-resources.json
similarity index 100%
rename from sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/test-resources.json
rename to sdk/spring/azure-spring-boot-test-keyvault/test-resources.json
diff --git a/sdk/spring/azure-spring-boot-tests/README.md b/sdk/spring/azure-spring-boot-tests/README.md
deleted file mode 100644
index 928b7a2efe58..000000000000
--- a/sdk/spring/azure-spring-boot-tests/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-#Azure Spring Boot Integration tests client library for Java
-
-## Key concepts
-The structure of integration tests are organized as:
-
-- azure-spring-boot-tests  (top folder for integration tests)
-   - azure-spring-boot-test-core (common code shared by integration tests)
-   - azure-spring-boot-test-keyvault (integration tests for key vault starter)
-   - azure-spring-boot-test-aad  (integration tests for aad starter)
-   - azure-spring-boot-test-cosmosdb (integration tests for cosmos starter)
-   - azure-spring-boot-test-application (an application used by other integration tests)
-
-## Getting started
-## Key concepts
-## Examples
-## Troubleshooting
-## Next steps
-## Contributing
diff --git a/sdk/spring/azure-spring-boot-tests/pom.xml b/sdk/spring/azure-spring-boot-tests/pom.xml
deleted file mode 100644
index 2647b21503a5..000000000000
--- a/sdk/spring/azure-spring-boot-tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
-  </parent>
-
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>azure-spring-boot-tests</artifactId>
-  <version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-tests;current} -->
-  <packaging>pom</packaging>
-
-  <name>Azure Spring Boot Tests</name>
-  <description>Tests for Azure Spring Boot</description>
-
-  <modules>
-    <module>azure-spring-boot-test-core</module>
-    <module>azure-spring-boot-test-application</module>
-    <module>azure-spring-boot-test-aad</module>
-    <module>azure-spring-boot-test-cosmosdb</module>
-    <module>azure-spring-boot-test-keyvault</module>
-  </modules>
-
-  <properties>
-    <skipSpringITs>true</skipSpringITs>
-  </properties>
-
-</project>
diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml
index 7ccde32252d2..a2cfbd7ba4e1 100644
--- a/sdk/spring/ci.yml
+++ b/sdk/spring/ci.yml
@@ -56,31 +56,29 @@ extends:
         groupId: com.microsoft.azure
         safeName: azurespringbootstarterservicebusjms
     AdditionalModules:
-      - name: azure-spring-boot-samples
-        groupId: com.microsoft.azure
       - name: azure-spring-boot-sample-active-directory
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-active-directory-b2c-oidc
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-active-directory-backend
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-active-directory-backend-v2
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-active-directory-stateless
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-cosmosdb
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-data-gremlin
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-keyvault-secrets
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-mediaservices
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-servicebus
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-servicebus-jms-queue
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-servicebus-jms-topic
-        groupId: com.microsoft.azure
+        groupId: com.azure
       - name: azure-spring-boot-sample-storage-blob
-        groupId: com.microsoft.azure
+        groupId: com.azure
diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml
index b9e7c1e1216c..3ff7a064ef50 100644
--- a/sdk/spring/pom.xml
+++ b/sdk/spring/pom.xml
@@ -18,8 +18,25 @@
     <module>azure-spring-boot-starter-keyvault-secrets</module>
     <module>azure-spring-boot-starter-metrics</module>
     <module>azure-spring-boot-starter-servicebus-jms</module>
-    <module>azure-spring-boot-samples</module>
-    <module>azure-spring-boot-tests</module>
+    <module>azure-spring-boot-test-application</module>
+    <module>azure-spring-boot-test-core</module>
+    <module>azure-spring-boot-test-aad</module>
+    <module>azure-spring-boot-test-cosmosdb</module>
+    <module>azure-spring-boot-test-keyvault</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-active-directory</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-mediaservices</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-servicebus</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic</module>
+    <module>azure-spring-boot-samples/azure-spring-boot-sample-storage-blob</module>
+    <module>azure-spring-boot-samples/azure-cloud-foundry-service-sample</module>
   </modules>
 
 </project>
diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml
index 0a51f922ad7b..df60d67043f0 100644
--- a/sdk/spring/tests.yml
+++ b/sdk/spring/tests.yml
@@ -10,23 +10,21 @@ jobs:
           goals: "verify"
 
         Artifacts:
-          - name: azure-spring-boot-tests
-            groupId: com.microsoft.azure
-            safeName: azurespringboot-tests
+          - name: azure-spring-boot-test-application
+            groupId: com.azure
+            safeName: azurespringboottestapplication
           - name: azure-spring-boot-test-core
-            groupId: com.microsoft.azure
+            groupId: com.azure
             safeName: azurespringboottestcore
           - name: azure-spring-boot-test-cosmosdb
-            groupId: com.microsoft.azure
+            groupId: com.azure
             safeName: azurespringboottestcosmosdb
           - name: azure-spring-boot-test-aad
-            groupId: com.microsoft.azure
+            groupId: com.azure
             safeName: azurespringboottestaad
           - name: azure-spring-boot-test-keyvault
-            groupId: com.microsoft.azure
+            groupId: com.azure
             safeName: azurespringboottestkeyvault
-          - name: azure-spring-boot-test-application
-            groupId: com.microsoft.azure
-            safeName: azurespringboottestapplication
+
         EnvVars:
           AZURE_TEST_MODE: LIVE