diff --git a/defaults/main.yml b/defaults/main.yml
index fd80937..dc43251 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -241,7 +241,6 @@ zun_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
 
 zun_scheduler_default_filters: >-
   AvailabilityZoneFilter,
-  CPUFilter,
   ComputeFilter
 zun_scheduler_available_filters: zun.scheduler.filters.all_filters
 zun_scheduler_driver: filter_scheduler
diff --git a/templates/api-paste.ini.j2 b/templates/api-paste.ini.j2
index 58f7dfe..99e208f 100644
--- a/templates/api-paste.ini.j2
+++ b/templates/api-paste.ini.j2
@@ -1,4 +1,9 @@
-[pipeline:main]
+[composite:main]
+use = egg:Paste#urlmap
+/: zun_api_pipeline
+/healthcheck: healthcheck
+
+[pipeline:zun_api_pipeline]
 pipeline = cors request_id osprofiler authtoken api_v1
 
 [app:api_v1]
@@ -17,3 +22,8 @@ paste.filter_factory = oslo_middleware:RequestId.factory
 [filter:cors]
 paste.filter_factory =  oslo_middleware.cors:filter_factory
 oslo_config_project = zun
+
+[app:healthcheck]
+paste.app_factory = oslo_middleware:Healthcheck.app_factory
+backends = disable_by_file
+disable_by_file_path = /etc/zun/healthcheck_disable