diff --git a/meta/main.yml b/meta/main.yml
index cb22d17..822502a 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/mistral_install.yml b/tasks/mistral_install.yml
index 23d5055..ecabd67 100644
--- a/tasks/mistral_install.yml
+++ b/tasks/mistral_install.yml
@@ -61,7 +61,7 @@
   package:
     name: "{{ mistral_package_list }}"
     state: "{{ mistral_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 8fc9450..a444527 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -24,7 +24,7 @@ mistral_service_distro_packages:
   - openstack-mistral-engine
   - openstack-mistral-executor
   - openstack-mistral-notifier
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
+  - python3-systemd
 
 mistral_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-lib
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index 4ff14f1..0000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Copyright 2019, 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.
-
-mistral_devel_distro_packages:
-  - git
-  - systemd-devel
-
-mistral_distro_packages: []
-
-mistral_service_distro_packages:
-  - openstack-mistral
-  - python-systemd
-
-mistral_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl
-  - cyrus-sasl-plain
-  - cyrus-sasl-digestmd5