diff --git a/roles/edpm_tripleo_cleanup/defaults/main.yml b/roles/edpm_tripleo_cleanup/defaults/main.yml
index 649d77b2e..5e6fe98d6 100644
--- a/roles/edpm_tripleo_cleanup/defaults/main.yml
+++ b/roles/edpm_tripleo_cleanup/defaults/main.yml
@@ -24,16 +24,16 @@ edpm_remove_tripleo_unit_files: true
 
 # Keep services listed
 edpm_service_removal_skip_list:
-  - tripleo_swift_account_auditor
-  - tripleo_swift_account_reaper
-  - tripleo_swift_account_replicator
-  - tripleo_swift_account_server
-  - tripleo_swift_container_auditor
-  - tripleo_swift_container_replicator
-  - tripleo_swift_container_server
-  - tripleo_swift_container_updater
-  - tripleo_swift_object_auditor
-  - tripleo_swift_object_expirer
-  - tripleo_swift_object_replicator
-  - tripleo_swift_object_server
-  - tripleo_swift_object_updater
+  - tripleo_swift_account_auditor.service
+  - tripleo_swift_account_reaper.service
+  - tripleo_swift_account_replicator.service
+  - tripleo_swift_account_server.service
+  - tripleo_swift_container_auditor.service
+  - tripleo_swift_container_replicator.service
+  - tripleo_swift_container_server.service
+  - tripleo_swift_container_updater.service
+  - tripleo_swift_object_auditor.service
+  - tripleo_swift_object_expirer.service
+  - tripleo_swift_object_replicator.service
+  - tripleo_swift_object_server.service
+  - tripleo_swift_object_updater.service
diff --git a/roles/edpm_tripleo_cleanup/tasks/main.yml b/roles/edpm_tripleo_cleanup/tasks/main.yml
index 38335919f..e96bad415 100644
--- a/roles/edpm_tripleo_cleanup/tasks/main.yml
+++ b/roles/edpm_tripleo_cleanup/tasks/main.yml
@@ -34,12 +34,9 @@
   block:
     - name: Get all services
       ansible.builtin.service_facts:
-    - name: Filter for tripleo services
+    - name: Filter for tripleo services and skip the ones in skip list
       ansible.builtin.set_fact:
-        tripleo_services: "{{ ansible_facts.services.keys() | select('contains', 'tripleo') }}"
-    - name: Filter services in skip list
-      ansible.builtin.set_fact:
-        tripleo_services: "{{ tripleo_services | reject('in', edpm_service_removal_skip_list ) }}"
+        tripleo_services: "{{ ansible_facts.services.keys() | select('contains', 'tripleo') | reject('in', edpm_service_removal_skip_list ) }}"
 
 - name: Stop and disable tripleo services
   tags:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0bf267e76..f1f1ac388 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -50,3 +50,4 @@
               - ^roles/edpm_ovn/*
               - ^roles/edpm_neutron_metadata/*
               - ^roles/edpm_pre_adoption_validation/*
+              - ^roles/edpm_tripleo_cleanup/*