diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
index c7abd8c..0ae8893 100644
--- a/roles/ansible/tasks/main.yml
+++ b/roles/ansible/tasks/main.yml
@@ -12,7 +12,7 @@
           - python3-botocore
           - python3-setuptools
       become: true
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
     - name: Install Ansible-required packages via apk
       apk:
         name:
diff --git a/roles/base-user/tasks/main.yml b/roles/base-user/tasks/main.yml
index 531a321..3e3fa25 100644
--- a/roles/base-user/tasks/main.yml
+++ b/roles/base-user/tasks/main.yml
@@ -13,14 +13,14 @@
     groups: sudo
     append: yes
   become: yes
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_os_familiy == "Debian"
 - name: Add user to wheel
   user:
     name: "{{ user_username }}"
     groups: wheel
     append: yes
   become: yes
-  when: ansible_distribution != "Ubuntu"
+  when: ansible_os_family != "Debian"
 - name: Bootstrap user
   block:
   - name: Assure .ssh directory
diff --git a/roles/common/tasks/ansibleuser.yml b/roles/common/tasks/ansibleuser.yml
index 7d559cb..42e5ec0 100644
--- a/roles/common/tasks/ansibleuser.yml
+++ b/roles/common/tasks/ansibleuser.yml
@@ -12,12 +12,12 @@
       user:
         name: ansible
         groups: sudo
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
     - name: Enroll Ansible user in wheel
       user:
         name: ansible
         groups: wheel
-      when: ansible_distribution != "Ubuntu"
+      when: ansible_os_family != "Debian"
     - name: Ensure perms on Ansible user home
       file:
         path: "/home/ansible"
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 0597ae5..8f5a27a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -16,7 +16,7 @@
     - name: Set hostname
       hostname:
         name: "{{ inventory_hostname }}"
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
     - name: Set hostname for PMOS
       hostname:
         name: "{{ inventory_hostname }}"
@@ -26,7 +26,7 @@
       timezone:
         name: "America/Chicago"
       notify: restart cron
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
     - name: Configure MOTD
       block:
       - name: Disable MOTD news
@@ -49,10 +49,10 @@
           - "92-unattended-upgrades"
           - "95-hwe-eol"
           - "97-overlayroot"
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
     - name: Configure Ansible user
       include_tasks: ansibleuser.yml
     - name: Configure services
       include_tasks: services.yml
-      when: ansible_distribution == "Ubuntu"
+      when: ansible_os_family == "Debian"
   become: yes
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index 3fb72ca..6260812 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -31,7 +31,7 @@
         name:
           - smartmontools
   become: yes
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_os_family == "Debian"
 - name: Install packages via APK
   block:
     - name: Update and upgrade packages