diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py
index 3dc286e8b..da7b8204c 100644
--- a/tripleo_common/image/kolla_builder.py
+++ b/tripleo_common/image/kolla_builder.py
@@ -100,18 +100,11 @@ def build_service_filter(environment, roles_data):
         return None
     enabled_services = get_enabled_services(environment, roles_data)
     resource_registry = environment.get('resource_registry')
-    if not resource_registry:
-        # no way to tell which services are non-containerized, so
-        # filter by enabled services
-        return enabled_services
-
-    for service, env_path in environment.get('resource_registry', {}).items():
-        if service not in enabled_services:
-            continue
-        if env_path == 'OS::Heat::None':
-            enabled_services.remove(service)
-        if '/puppet/services' in env_path:
-            enabled_services.remove(service)
+    if resource_registry:
+        for service in enabled_services.copy():
+            env_path = resource_registry.get(service)
+            if env_path == 'OS::Heat::None':
+                enabled_services.remove(service)
 
     return enabled_services
 
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index 3959a0d95..7df45957b 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -791,12 +791,11 @@ class TestPrepare(base.TestCase):
                 'OS::TripleO::Services::HeatApi',
                 'OS::TripleO::Services::NovaApi',
                 'OS::TripleO::Services::NovaCompute',
+                'OS::TripleO::Services::NeutronApi',
                 'OS::TripleO::Services::Kubernetes::Worker',
             ]),
             kb.build_service_filter({
                 'resource_registry': {
-                    'OS::TripleO::Services::NeutronApi':
-                    '/tht/puppet/services/foo.yaml',
                     'OS::TripleO::Services::NovaApi':
                     '/tht/docker/services/foo.yaml',
                     'OS::TripleO::Services::NovaCompute':