diff --git a/pom.xml b/pom.xml
index 31372594d..a0b7525ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,18 @@
 
   <name>Azure Spring Boot Samples</name>
 
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <version.guava>25.0-jre</version.guava>
+    <version.spring.cloud>2021.0.0</version.spring.cloud>
+    <version.azure-spring-data-cosmos>3.17.0</version.azure-spring-data-cosmos>
+    <version.spring.cloud.azure>4.0.0-beta.4</version.spring.cloud.azure>
+    <version.spring-cloud-appconfiguration-config>2.3.0</version.spring-cloud-appconfiguration-config>
+    <version.spring-cloud-feature-management>2.2.0</version.spring-cloud-feature-management>
+    <version.azure-spring-boot-starter-keyvault-certificates>3.13.0</version.azure-spring-boot-starter-keyvault-certificates>
+  </properties>
+
   <modules>
     <module>aad/spring-cloud-azure-starter-active-directory/aad-resource-server</module>
     <module>aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter</module>
@@ -106,21 +118,9 @@
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
-        <version>${version.azure-spring-boot-bom}</version>
+        <version>${version.azure-spring-boot-starter-keyvault-certificates}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <version.spring.cloud>2021.0.0</version.spring.cloud>
-    <version.spring.cloud.azure>4.0.0-beta.4</version.spring.cloud.azure>
-    <version.spring-cloud-appconfiguration-config>2.3.0</version.spring-cloud-appconfiguration-config>
-    <version.spring-cloud-feature-management>2.2.0</version.spring-cloud-feature-management>
-    <version.guava>25.0-jre</version.guava>
-    <version.azure-spring-data-cosmos>3.17.0</version.azure-spring-data-cosmos>
-    <version.azure-spring-boot-bom>3.13.0</version.azure-spring-boot-bom>
-  </properties>
-
 </project>
diff --git a/spring-petclinic-microservices/pom.xml b/spring-petclinic-microservices/pom.xml
index 70fe0f408..1b2279e49 100644
--- a/spring-petclinic-microservices/pom.xml
+++ b/spring-petclinic-microservices/pom.xml
@@ -27,6 +27,19 @@
     <module>spring-petclinic-api-gateway</module>
   </modules>
 
+  <properties>
+    <docker.image.prefix>springcommunity</docker.image.prefix>
+    <docker.image.exposed.port>9090</docker.image.exposed.port>
+    <docker.image.dockerfile.dir>${basedir}</docker.image.dockerfile.dir>
+    <docker.image.dockerize.version>v0.6.1</docker.image.dockerize.version>
+    <docker.plugin.version>1.2.2</docker.plugin.version>
+    <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
+    <webjars-bootstrap.version>3.3.7-1</webjars-bootstrap.version>
+    <webjars-jquery.version>3.1.1-1</webjars-jquery.version>
+    <webjars-angular.version>1.6.4</webjars-angular.version>
+    <webjars-angular-ui-router.version>1.0.3</webjars-angular-ui-router.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -62,19 +75,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <properties>
-    <docker.image.prefix>springcommunity</docker.image.prefix>
-    <docker.image.exposed.port>9090</docker.image.exposed.port>
-    <docker.image.dockerfile.dir>${basedir}</docker.image.dockerfile.dir>
-    <docker.image.dockerize.version>v0.6.1</docker.image.dockerize.version>
-    <docker.plugin.version>1.2.2</docker.plugin.version>
-    <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
-    <webjars-bootstrap.version>3.3.7-1</webjars-bootstrap.version>
-    <webjars-jquery.version>3.1.1-1</webjars-jquery.version>
-    <webjars-angular.version>1.6.4</webjars-angular.version>
-    <webjars-angular-ui-router.version>1.0.3</webjars-angular-ui-router.version>
-  </properties>
-
   <repositories>
     <repository>
       <id>spring-milestones</id>