diff --git a/tasks/main.yml b/tasks/main.yml
index 54507dc7ac3685a8764be477c1e3a92896db7a69..cf0b23910d96ef5527a63b1b30f0cb4985b99302 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,7 +12,7 @@
         - ansible_os_family in php_fpm_pools_dir
         - ansible_os_family in php_fpm_user
         - ansible_distribution_release in ['precise', 'wheezy', 'jessie', 'trusty'] or ansible_distribution_version in ['6.0']
-        - ansible_os_family != 'OpenBSD' or ansible_distribution_release in php_fpm_pkg_version
+        - ansible_os_family != 'OpenBSD' or ansible_distribution_version in php_fpm_pkg_version
         - php_fpm_global_config is iterable
         - php_fpm_www_pool_config is iterable
 
@@ -27,7 +27,7 @@
 - name: pkg install
   when: ansible_pkg_mgr == 'openbsd_pkg'
   openbsd_pkg:
-      name: '{{ php_fpm_pkg_version[ansible_distribution_release] }}'
+      name: '{{ php_fpm_pkg_version[ansible_distribution_version] }}'
       state: present
 
 - name: Create pools directory