diff --git a/templates/sao-fpm.ini.j2 b/templates/sao-fpm.ini.j2
new file mode 100644
index 0000000..40d8689
--- /dev/null
+++ b/templates/sao-fpm.ini.j2
@@ -0,0 +1,21 @@
+upload_max_filesize = 15M
+post_max_size = 15M
+memory_limit = 192M
+max_execution_time = 300
+
+date.timezone = Europe/Berlin
+default_charset = "UTF-8"
+
+;Upload-Fortschritt
+apc.rfc1867 = 1
+
+{% if inventory_hostname == "wwwusers.sao" %}
+error_log = /var/log/php.log
+{% endif %}
+display_errors = Off
+
+;Empfohlene Einstellungen (pcc)
+allow_url_fopen = Off
+assert.active = Off
+mail.add_x_header = Off
+session.use_strict_mode = 1
diff --git a/templates/sao.ini.j2 b/templates/sao.ini.j2
index 7ff143e..c677d05 100644
--- a/templates/sao.ini.j2
+++ b/templates/sao.ini.j2
@@ -1,16 +1,7 @@
-{% if inventory_hostname == "wwwusers.sao" %}
-file_uploads = on
-max_execution_time=120
-max_input_time=120
-post_max_size=16M
-upload_max_filesize=16M
-SMTP=mail-postfix.sao
-{% else %}
-upload_max_filesize = 15M
-post_max_size = 15M
+upload_max_filesize = 16M
+post_max_size = 16M
 memory_limit = 192M
 max_execution_time = 300
-{% endif %}
 
 date.timezone = Europe/Berlin
 default_charset = "UTF-8"
@@ -18,17 +9,10 @@ default_charset = "UTF-8"
 ;Upload-Fortschritt
 apc.rfc1867 = 1
 
-{% if inventory_hostname == "webmail-horde.sao" %}
-disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,parse_ini_file,show_source,dl,symlink,mail,system_exec,exec,shell_exec,phpinfo
-{% elif inventory_hostname == "wwwusers.sao" %}
-disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,show_source,dl,symlink,system_exec,exec,shell_exec,phpinfo
-{% elif inventory_hostname == "kameradisten.ramus" %}
+{% if inventory_hostname == "kameradisten.ramus" or inventory_hostname == "kameradisten.ramus" %}
 disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_exec,passthru,system,proc_get_status,proc_close,proc_nice,proc_terminate,proc_open,curl_ini,parse_ini_file,show_source,dl,symlink,system_exec,exec,shell_exec,phpinfo
 {% endif %}
 
-{% if inventory_hostname == "wwwusers.sao" %}
-error_log = /var/log/php.log
-{% endif %}
 display_errors = Off
 
 ;Empfohlene Einstellungen (pcc)