diff --git a/build.gradle b/build.gradle
index 627aa024b04..d04a8307baa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -202,7 +202,7 @@ allprojects {
             implementation("javax.servlet:javax.servlet-api:4.0.1")
 	        implementation("commons-configuration:commons-configuration:1.10")
 	        implementation("org.apache.commons:commons-configuration2:2.7")
-            implementation("org.hibernate:hibernate-validator:7.0.1.Final")
+            implementation("org.hibernate:hibernate-validator:6.2.0.Final")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:7.4.0")
diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/pom.xml b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/pom.xml
index e6b43657d6c..f6273084c65 100644
--- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/pom.xml
+++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/pom.xml
@@ -131,6 +131,11 @@
             <artifactId>snappy-java</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -155,7 +160,10 @@
                                 </ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.janusgraph:janusgraph-cql:*
                                 </ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>joda-time:joda-time:*</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>joda-time:joda-time:*
+                                </ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.hibernate.validator:hibernate-validator:*
+                                </ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.antlr:antlr-runtime:jar:*
                                 </ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.xerial.snappy:snappy-java:*
diff --git a/open-metadata-implementation/server-chassis/server-chassis-spring/pom.xml b/open-metadata-implementation/server-chassis/server-chassis-spring/pom.xml
index 7c8c2a2b670..603c89347a8 100644
--- a/open-metadata-implementation/server-chassis/server-chassis-spring/pom.xml
+++ b/open-metadata-implementation/server-chassis/server-chassis-spring/pom.xml
@@ -408,6 +408,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -496,6 +501,9 @@
                                 <!-- Spring seems to cause false positives on dependency checker -->
                                 <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-web:*
                                 </ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-validation:*
+                                </ignoredUnusedDeclaredDependency>
+
                                 <ignoredUnusedDeclaredDependency>
                                     org.springframework.boot:spring-boot-starter-security:*
                                 </ignoredUnusedDeclaredDependency>
diff --git a/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java b/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java
index 21198c73d58..929fa5c7e8f 100644
--- a/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java
+++ b/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java
@@ -20,7 +20,6 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -32,8 +31,9 @@
 import java.util.*;
 
 
-@SpringBootApplication
-@ComponentScan(basePackages = {"${scan.packages}"})
+@SpringBootApplication(
+        scanBasePackages = {"${scan.packages}"}
+)
 @OpenAPIDefinition(
         info = @Info(
                 title = "Egeria's Open Metadata and Governance (OMAG) Server Platform",
diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/pom.xml b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/pom.xml
index 95796b81893..257aa943b3b 100644
--- a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/pom.xml
+++ b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/pom.xml
@@ -36,6 +36,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -369,7 +374,6 @@
                                 <ignoredUnusedDeclaredDependency>org.odpi.egeria:*spring*</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>javax.xml.bind:*jaxb*</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.springframework.boot:*:*</ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>org.springframework.cloud:*:*</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.apache.tomcat.embed:tomcat-embed-core:*</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                         </configuration>
diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java
index e6490b475bb..a4135090ae5 100644
--- a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java
+++ b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java
@@ -26,8 +26,7 @@
 import javax.annotation.PostConstruct;
 
 @SpringBootApplication(
-        scanBasePackages = {"${scan.packages}"},
-        exclude={DataSourceAutoConfiguration.class}
+        scanBasePackages = {"${scan.packages}"}
 )
 @EnableConfigurationProperties(
         {
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/pom.xml b/open-metadata-test/open-metadata-fvt/access-services-fvt/pom.xml
index 583fa9f4803..3e45394348f 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/pom.xml
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/pom.xml
@@ -27,13 +27,6 @@
 
     <artifactId>access-services-fvt</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.odpi.egeria</groupId>
-            <artifactId>graph-repository-connector</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <!-- We don't make use of the assembly at a jar level, but we need it
diff --git a/pom.xml b/pom.xml
index 52311be1f67..08f7cee158b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
         <javax.servlet.version>4.0.1</javax.servlet.version>
         <thrift.version>0.15.0</thrift.version>
         <elasticsearch.version>7.15.1</elasticsearch.version>
-        <hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
+        <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
         <!-- Versions of plugins -->
         <enunciate-maven-plugin.version>2.10.1</enunciate-maven-plugin.version>
         <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
@@ -2782,6 +2782,12 @@
                 <version>${spring-boot.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-validation</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-test</artifactId>