diff --git a/pom.xml b/pom.xml
index 3ad764d..71a0de8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>4.2.0</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
index f5a47f6..cd6f116 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
@@ -285,27 +285,7 @@ public class JpaRestfulServer extends RestfulServer {
     }
 
     // Validation
-    IValidatorModule validatorModule;
-    switch (fhirVersion) {
-            case DSTU2:
-                validatorModule = appCtx.getBean("myInstanceValidatorDstu2", IValidatorModule.class);
-                break;
-      case DSTU3:
-        validatorModule = appCtx.getBean("myInstanceValidatorDstu3", IValidatorModule.class);
-        break;
-      case R4:
-        validatorModule = appCtx.getBean("myInstanceValidatorR4", IValidatorModule.class);
-        break;
-      case R5:
-        validatorModule = appCtx.getBean("myInstanceValidatorR5", IValidatorModule.class);
-        break;
-            // These versions are not supported by HAPI FHIR JPA
-            case DSTU2_HL7ORG:
-            case DSTU2_1:
-      default:
-        validatorModule = null;
-        break;
-    }
+    IValidatorModule validatorModule = appCtx.getBean(IValidatorModule.class);
     if (validatorModule != null) {
       if (HapiProperties.getValidateRequestsEnabled()) {
         RequestValidatingInterceptor interceptor = new RequestValidatingInterceptor();