diff --git a/deployment/ehr-proxy/ehr-proxy-app/lib/ehr-proxy-app-stack.ts b/deployment/ehr-proxy/ehr-proxy-app/lib/ehr-proxy-app-stack.ts
index 1716e1bb6..655d1fa37 100644
--- a/deployment/ehr-proxy/ehr-proxy-app/lib/ehr-proxy-app-stack.ts
+++ b/deployment/ehr-proxy/ehr-proxy-app/lib/ehr-proxy-app-stack.ts
@@ -104,7 +104,7 @@ export class EhrProxyAppStack extends cdk.Stack {
       port: smartProxy.containerPort,
       protocol: ApplicationProtocol.HTTP,
       targets: [hapiTarget],
-      healthCheck: { path: '/fhir/metadata' }
+      healthCheck: { path: '/fhir/metadata', interval: cdk.Duration.seconds(180) }
     });
     listener.addAction('EhrProxyHapiAction', {
       action: ListenerAction.forward([hapiTargetGroup]),
diff --git a/deployment/ehr-proxy/hapi-endpoint/lib/index.ts b/deployment/ehr-proxy/hapi-endpoint/lib/index.ts
index 252bdf9fc..0d6266511 100644
--- a/deployment/ehr-proxy/hapi-endpoint/lib/index.ts
+++ b/deployment/ehr-proxy/hapi-endpoint/lib/index.ts
@@ -29,8 +29,8 @@ export class HapiEndpoint extends Construct {
     // Create a task definition that contains both the application and cache containers.
     const taskDefinition = new TaskDefinition(this, 'EhrProxyHapiTaskDefinition', {
       compatibility: Compatibility.FARGATE,
-      cpu: '2048',
-      memoryMiB: '4096'
+      cpu: '1024',
+      memoryMiB: '2048'
     });
 
     // Create the cache container.
diff --git a/deployment/forms-server/forms-server-app/lib/forms-server-app-stack.ts b/deployment/forms-server/forms-server-app/lib/forms-server-app-stack.ts
index f2e1ac5c4..14602e9b4 100644
--- a/deployment/forms-server/forms-server-app/lib/forms-server-app-stack.ts
+++ b/deployment/forms-server/forms-server-app/lib/forms-server-app-stack.ts
@@ -70,7 +70,7 @@ export class FormsServerAppStack extends cdk.Stack {
       port: hapi.containerPort,
       protocol: ApplicationProtocol.HTTP,
       targets: [hapiTarget],
-      healthCheck: { path: '/fhir/metadata' }
+      healthCheck: { path: '/fhir/metadata', interval: cdk.Duration.seconds(180) }
     });
     listener.addAction('FormsServerDefaultAction', {
       action: ListenerAction.forward([hapiTargetGroup])
diff --git a/deployment/forms-server/hapi-endpoint/lib/index.ts b/deployment/forms-server/hapi-endpoint/lib/index.ts
index d46a4fb7d..08d9376da 100644
--- a/deployment/forms-server/hapi-endpoint/lib/index.ts
+++ b/deployment/forms-server/hapi-endpoint/lib/index.ts
@@ -44,7 +44,8 @@ export class HapiEndpoint extends Construct {
       }),
       environment: {
         use_apache_address_strategy: 'true',
-        'hapi.fhir.openapi_enabled': 'false'
+        'hapi.fhir.openapi_enabled': 'false',
+        'hapi.fhir.cr.enabled': 'true'
       }
     });