diff --git a/roles/openafs-client/tasks/openafs-client/Debian.yaml b/roles/openafs-client/tasks/openafs-client/Debian.yaml
index 02fb9fa0d6..2d161ec9aa 100644
--- a/roles/openafs-client/tasks/openafs-client/Debian.yaml
+++ b/roles/openafs-client/tasks/openafs-client/Debian.yaml
@@ -1,11 +1,3 @@
-- name: Install kernel modules
-  package:
-    name:
-      - linux-headers-{{ ansible_kernel }}
-      - openafs-modules-dkms
-    state: present
-  become: yes
-
 # Bionic version is dangerously out of date; use later version.
 #  https://bugs.launchpad.net/ubuntu/+source/openafs/+bug/1832690
 - name: Install openstackci openafs PPA
@@ -14,10 +6,26 @@
   when: ansible_distribution_version is version('18.04', '>=')
   become: yes
 
+- name: Install kernel headers dependency
+  package:
+    name:
+      - linux-headers-{{ ansible_kernel }}
+    state: present
+  become: yes
+
+# NOTE(ianw) : Need to do this first and separately so that the
+# modules are ready for the openafs-client package to start.
+- name: Install openafs kernel modules
+  package:
+    name:
+      - openafs-modules-dkms
+    state: latest
+  become: yes
+
 - name: Install client packages
   package:
     name:
       - openafs-client
       - openafs-krb5
-    state: present
+    state: latest
   become: yes