diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/annotations/OnDSTU3Condition.java b/src/main/java/ca/uhn/fhir/jpa/starter/annotations/OnDSTU3Condition.java
new file mode 100644
index 0000000..1196245
--- /dev/null
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/annotations/OnDSTU3Condition.java
@@ -0,0 +1,19 @@
+package ca.uhn.fhir.jpa.starter.annotations;
+
+import ca.uhn.fhir.context.FhirVersionEnum;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class OnDSTU3Condition implements Condition {
+  @Override
+  public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata metadata) {
+    FhirVersionEnum version = FhirVersionEnum.forVersionString(conditionContext.
+      getEnvironment()
+      .getProperty("hapi.fhir.fhir_version")
+      .toUpperCase());
+
+    return version == FhirVersionEnum.DSTU3;
+
+  }
+}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 362c299..fcb9b5b 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -28,7 +28,7 @@ spring:
 hapi:
   fhir:
     ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5
-    fhir_version: DSTU3
+#    fhir_version: DSTU3 #Default is R4
 #    defer_indexing_for_codesystems_of_size: 101
 #    implementationguides:
 #      -