diff --git a/roles/php-fpm/templates/php7.4-php.ini.j2 b/roles/php-fpm/templates/php7.4-php.ini.j2
index ef89b71..1eb3d2c 100644
--- a/roles/php-fpm/templates/php7.4-php.ini.j2
+++ b/roles/php-fpm/templates/php7.4-php.ini.j2
@@ -959,7 +959,9 @@ cli_server.color = On
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-;date.timezone =
+{% if timezone is defined %}
+date.timezone = {{ timezone }}
+{% endif %}
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667
@@ -1765,20 +1767,20 @@ ldap.max_links = -1
 
 [opcache]
 ; Determines if Zend OPCache is enabled
-;opcache.enable=1
+opcache.enable={{ opcache_enable }}
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
+opcache.enable_cli={{ opcache_enable_cli }}
 
 ; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
+opcache.memory_consumption={{ opcache_memory_consumption }}
 
 ; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
+opcache.interned_strings_buffer={{ opcache_interned_strings_buffer }}
 
 ; The maximum number of keys (scripts) in the OPcache hash table.
 ; Only numbers between 200 and 1000000 are allowed.
-;opcache.max_accelerated_files=10000
+opcache.max_accelerated_files={{ opcache_max_accelerated_files }}
 
 ; The maximum percentage of "wasted" memory until a restart is scheduled.
 ;opcache.max_wasted_percentage=5
@@ -1787,23 +1789,23 @@ ldap.max_links = -1
 ; directory to the script key, thus eliminating possible collisions between
 ; files with the same name (basename). Disabling the directive improves
 ; performance, but may break existing applications.
-;opcache.use_cwd=1
+opcache.use_cwd={{ opcache_use_cwd }}
 
 ; When disabled, you must reset the OPcache manually or restart the
 ; webserver for changes to the filesystem to take effect.
-;opcache.validate_timestamps=1
+opcache.validate_timestamps={{ opcache_validate_timestamps }}
 
 ; How often (in seconds) to check file timestamps for changes to the shared
 ; memory storage allocation. ("1" means validate once per second, but only
 ; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
+opcache.revalidate_freq={{ opcache_revalidate_freq }}
 
 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
 ; size of the optimized code.
-;opcache.save_comments=1
+opcache.save_comments={{ opcache_save_comments }}
 
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
diff --git a/roles/php-fpm/templates/php7.4-pool.conf.j2 b/roles/php-fpm/templates/php7.4-pool.conf.j2
index 3528376..bd20cf5 100644
--- a/roles/php-fpm/templates/php7.4-pool.conf.j2
+++ b/roles/php-fpm/templates/php7.4-pool.conf.j2
@@ -1,7 +1,9 @@
-; Start a new pool named 'www'.
+{% set domain_name  = item.domain_name %}
+
+; Start a new pool named '{{ domain_name }}'.
 ; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('www' here)
-[www]
+; pool name ('{{ domain_name }}' here)
+[{{ domain_name }}]
 
 ; Per pool prefix
 ; It only applies on the following directives:
@@ -20,8 +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.
-user = www-data
-group = www-data
+user = nginx
+group = nginx
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -33,7 +35,7 @@ group = www-data
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php/php7.4-fpm.sock
+listen = /run/php/php7.4-fpm-{{ domain_name }}.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -304,14 +306,10 @@ pm.max_spare_servers = 3
 ;  %s: status (response code)
 ;  %t: server time the request was received
 ;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
 ;  %T: time the log has been written (the request has finished)
 ;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
 ;  %u: remote user
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"