diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index f9d5b33..378f73c 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -1,10 +1,6 @@
 
 # Run as a unique, less privileged user for security reasons.
-{% if ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') %}
-user  www-data;
-{% else %}
 user nginx;
-{% endif %}
 
 # Sets the worker threads to the number of CPU cores available in the system for best performance.
 # Should be > the number of CPU cores.
diff --git a/roles/php-fpm/templates/php7.0-pool.conf.j2 b/roles/php-fpm/templates/php7.0-pool.conf.j2
index d8c5787..225b588 100644
--- a/roles/php-fpm/templates/php7.0-pool.conf.j2
+++ b/roles/php-fpm/templates/php7.0-pool.conf.j2
@@ -22,13 +22,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-{% if ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') %}
-user = www-data
-group = www-data
-{% else %}
 user = nginx
 group = nginx
-{% endif %}
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -49,13 +44,8 @@ listen = /run/php/php7.0-fpm-{{ domain_name }}.sock
 ; BSD-derived systems allow connections regardless of permissions.
 ; Default Values: user and group are set as the running user
 ;                 mode is set to 0660
-{% if ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') %}
-listen.owner = www-data
-listen.group = www-data
-{% else %}
 listen.owner = nginx
 listen.group = nginx
-{% endif %}
 ;listen.mode = 0660
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.