diff --git a/zuul.d/playbooks/pre-gate-cleanup.yml b/zuul.d/playbooks/pre-gate-cleanup.yml
index f22d1b3a5b..86fe6924e7 100644
--- a/zuul.d/playbooks/pre-gate-cleanup.yml
+++ b/zuul.d/playbooks/pre-gate-cleanup.yml
@@ -18,29 +18,33 @@
   become: yes
   become_user: root
   tasks:
-    - name: Gather variables for each operating system
-      include_vars: "{{ ansible_os_family | lower }}.yml"
 
-    - name: Remove known problem distro packages
-      package:
-        name: "{{ gate_packages_remove }}"
-        state: absent
+    - name: Cleanup gate images
+      block:
+        - name: Gather variables for each operating system
+          include_vars: "{{ ansible_os_family | lower }}.yml"
 
-    - name: Remove known problem pip packages
-      pip:
-        name:
-          - virtualenv
-          - tox
-          - appdirs
-          - contextlib2
-          - distlib
-          - filelock
-          - importlib_metadata
-          - importlib_resources
-          - six
-          - zipp
-          - backports
-        state: absent
+        - name: Remove known problem distro packages
+          package:
+            name: "{{ gate_packages_remove }}"
+            state: absent
+
+        - name: Remove known problem pip packages
+          pip:
+            name:
+              - virtualenv
+              - tox
+              - appdirs
+              - contextlib2
+              - distlib
+              - filelock
+              - importlib_metadata
+              - importlib_resources
+              - six
+              - zipp
+              - backports
+            state: absent
+      when: ansible_os_family | lower in ['debian', 'redhat']
 
     - name: Remove package blacklist for yum/dnf
       lineinfile:
diff --git a/zuul.d/playbooks/vars/suse.yml b/zuul.d/playbooks/vars/suse.yml
deleted file mode 100644
index 121e0cabeb..0000000000
--- a/zuul.d/playbooks/vars/suse.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Copyright 2020, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-gate_packages_remove:
-  - python-virtualenv
-  - python2-virtualenv