diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java
index 77f234e..845900b 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java
@@ -13,6 +13,8 @@ import org.opencds.cqf.fhir.cr.hapi.cdshooks.ICdsCrServiceRegistry;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CdsCrDiscoveryServiceRegistry;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.ICdsCrDiscoveryServiceRegistry;
 import org.opencds.cqf.fhir.cr.hapi.config.CrCdsHooksConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.RepositoryConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.test.TestCdsHooksConfig;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -22,24 +24,9 @@ import org.springframework.context.annotation.Import;
 
 @Configuration
 @Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class})
-// LUKETODO:  Config missing ICdsServiceRegistry
-// LUKETODO:  HAPI-1653: Provider not supported for the current FHIR version
-@Import({CrCdsHooksConfig.class, CrCommonConfig.class})
+@Import({RepositoryConfig.class, TestCdsHooksConfig.class, CrCdsHooksConfig.class, CrCommonConfig.class})
 public class StarterCdsHooksConfig {
 
-	//	@Bean
-	//	CdsPrefetchSvc cdsPrefetchSvc(
-	//		CdsResolutionStrategySvc theCdsResolutionStrategySvc,
-	//		CdsPrefetchDaoSvc theResourcePrefetchDao,
-	//		CdsPrefetchFhirClientSvc theResourcePrefetchFhirClient,
-	//		ICdsHooksDaoAuthorizationSvc theCdsHooksDaoAuthorizationSvc) {
-	//		return new ModuleConfigurationPrefetchSvc(
-	//			theCdsResolutionStrategySvc,
-	//			theResourcePrefetchDao,
-	//			theResourcePrefetchFhirClient,
-	//			theCdsHooksDaoAuthorizationSvc);
-	//	}
-
 	@Bean
 	public ICdsCrDiscoveryServiceRegistry cdsCrDiscoveryServiceRegistry() {
 		CdsCrDiscoveryServiceRegistry registry = new CdsCrDiscoveryServiceRegistry();
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
index b707ffc..c1e3b5a 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
@@ -5,7 +5,7 @@ import org.opencds.cqf.fhir.cr.hapi.config.dstu3.CrDstu3Config;
 import org.opencds.cqf.fhir.cr.hapi.config.dstu3.DataRequirementsOperationConfig;
 import org.opencds.cqf.fhir.cr.hapi.config.dstu3.EvaluateOperationConfig;
 import org.opencds.cqf.fhir.cr.hapi.config.dstu3.PackageOperationConfig;
-import org.opencds.cqf.fhir.cr.hapi.config.r4.ApplyOperationConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.dstu3.ApplyOperationConfig;
 import org.springframework.context.annotation.*;
 
 @Configuration
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
index d8ad4f1..80ffc4c 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
@@ -1,9 +1,9 @@
 package ca.uhn.fhir.jpa.starter.cr;
 
 import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
-import org.opencds.cqf.fhir.cr.hapi.config.dstu3.DataRequirementsOperationConfig;
-import org.opencds.cqf.fhir.cr.hapi.config.dstu3.EvaluateOperationConfig;
-import org.opencds.cqf.fhir.cr.hapi.config.dstu3.PackageOperationConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.r4.DataRequirementsOperationConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.r4.EvaluateOperationConfig;
+import org.opencds.cqf.fhir.cr.hapi.config.r4.PackageOperationConfig;
 import org.opencds.cqf.fhir.cr.hapi.config.r4.ApplyOperationConfig;
 import org.opencds.cqf.fhir.cr.hapi.config.r4.CrR4Config;
 import org.opencds.cqf.fhir.cr.hapi.config.r4.ExtractOperationConfig;
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index a0756d6..30953c6 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -123,7 +123,7 @@ hapi:
         data:
           search_parameter_mode: USE_SEARCH_PARAMETERS # AUTO, USE_SEARCH_PARAMETERS, FILTER_IN_MEMORY
           terminology_parameter_mode: FILTER_IN_MEMORY #  AUTO, USE_VALUE_SET_URL, USE_INLINE_CODES, FILTER_IN_MEMORY
-          profile_mode: DECLARED # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF
+          profile_mode: OFF # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF
 
     cdshooks:
       enabled: false
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java b/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
index 9297cce..2745ce0 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
@@ -40,8 +40,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 		Application.class,
 		NicknameServiceConfig.class,
 		RepositoryConfig.class,
-		CrCdsHooksConfig.class,
 		TestCdsHooksConfig.class,
+		CrCdsHooksConfig.class,
 		StarterCdsHooksConfig.class
 	}, properties = {
 	"spring.profiles.include=storageSettingsTest",