diff --git a/roles/system/wg-admin/tasks/main.yml b/roles/system/wg-admin/tasks/main.yml
index 0f7799b..30b00e1 100644
--- a/roles/system/wg-admin/tasks/main.yml
+++ b/roles/system/wg-admin/tasks/main.yml
@@ -25,12 +25,12 @@
 - name: Set dns_command for co-openSUSE
   ansible.builtin.set_fact:
     wg_dns_command: "resolvectl dns %i 10.42.0.1; resolvectl domain %i ~admin"
-  when: ansible_distribution != "openSUSE"
+  when: '"openSUSE" not in ansible_distribution'
 
 - name: Set dns_command for openSUSE
   ansible.builtin.set_fact:
     wg_dns_command: "nmcli con mod %i ipv4.dns 10.42.0.1; nmcli con mod %i ipv4.dns-search ~admin"
-  when: ansible_distribution == "openSUSE"
+  when: '"openSUSE" in ansible_distribution'
 
 - name: Create the config
   vars:
diff --git a/roles/user/shell/zsh/tasks/install.yml b/roles/user/shell/zsh/tasks/install.yml
index bd03c8b..6367b4c 100644
--- a/roles/user/shell/zsh/tasks/install.yml
+++ b/roles/user/shell/zsh/tasks/install.yml
@@ -20,4 +20,4 @@
     name: yad
     state: present
   become: true
-  when: ansible_distribution not in [ "AlmaLinux" ]
+  when: 'ansible_distribution not in [ "AlmaLinux" ] and "openSUSE" not in ansible_distribution'