diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml
index 175dd04..f6010af 100644
--- a/roles/php-fpm/tasks/main.yml
+++ b/roles/php-fpm/tasks/main.yml
@@ -2,9 +2,9 @@
 # Note: Debian 9's php-fpm config is identical to Ubuntu 16.04's, so for now we
 # can capitalize on that and use the same tasks.
 
-- name: Configure php-fpm on Ubuntu and Debian 9
+- name: Configure php-fpm on Ubuntu 16.04 and Debian 9
   import_tasks: Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '=='))
+  when: (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '=='))
   tags: php-fpm
 
 - name: Configure php-fpm on Ubuntu 18.04