diff --git a/meta/main.yml b/meta/main.yml
index 711fc47e..35a2a0a5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,17 +22,14 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - stretch
+        - buster
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
+        - focal
     - name: EL
       versions:
-        - 7
-    - name: opensuse
-      versions:
-        - 15
+        - 8
   categories:
     - cloud
     - python
diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml
index d3de6e6c..a3c4398e 100644
--- a/tasks/swift_install.yml
+++ b/tasks/swift_install.yml
@@ -29,7 +29,7 @@
   package:
     name: "{{ swift_package_list }}"
     state: "{{ swift_package_state }}"
-    update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages
   until: install_packages is success
diff --git a/vars/redhat.yml b/vars/redhat.yml
index ed39ad32..e2609ed4 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -19,7 +19,7 @@ swift_distro_packages:
   - liberasurecode
   - openssh-server
   - openssh-clients
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('rsync', 'rsync-daemon') }}"
+  - rsync-daemon
 
 swift_devel_distro_packages:
   - git
@@ -30,9 +30,9 @@ swift_devel_distro_packages:
 
 swift_service_distro_packages:
   - openstack-swift
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-keystonemiddleware', 'python3-keystonemiddleware') }}"
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-memcached', 'python3-memcached') }}"
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-swift', 'python3-swift') }}"
+  - python3-keystonemiddleware
+  - python3-memcached
+  - python3-swift
 
 swift_account_distro_packages:
   - openstack-swift-account
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index 8b884fd0..00000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-# Copyright 2017, SUSE LINUX GmbH.
-#
-# 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.
-
-swift_distro_packages:
-  - cron
-  - liberasurecode1
-  - openssh
-  - rsync
-
-swift_devel_distro_packages:
-  - git-core
-  - liberasurecode-devel
-  - libffi-devel
-  - libopenssl-devel
-  - systemd-devel
-
-swift_service_distro_packages:
-  - openstack-swift
-  - python-python-memcached
-
-swift_account_distro_packages:
-  - openstack-swift-account
-
-swift_container_distro_packages:
-  - openstack-swift-container
-
-swift_object_distro_packages:
-  - openstack-swift-object
-
-swift_proxy_distro_packages:
-  - openstack-swift-proxy
-
-swift_rsync_service_name: rsyncd
-
-swift_sshd: sshd