diff --git a/tasks/config.yml b/tasks/config.yml
index cc6795c..00af866 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -31,7 +31,6 @@
       - regexp: '^fastcgi_param  DOCUMENT_ROOT'
         line: 'fastcgi_param  DOCUMENT_ROOT      $realpath_root;'
     -
-      - '{{ nginx_etc_dir }}/fastcgi_params'
       - '{{ nginx_etc_dir }}/fastcgi.conf'
   when: nginx_fastcgi_fix_realpath
 
diff --git a/tasks/install_FreeBSD.yml b/tasks/install_FreeBSD.yml
index b350563..c07cddc 100644
--- a/tasks/install_FreeBSD.yml
+++ b/tasks/install_FreeBSD.yml
@@ -45,27 +45,6 @@
     - sites-available
     - sites-enabled
 
-- name: STAT | Check fastcgi.conf
-  stat:
-    path: "{{ nginx_etc_dir }}/fastcgi.conf"
-  register: conf
-
-- name: COPY | config
-  command: "cp {{ nginx_etc_dir }}/fastcgi_params {{ nginx_etc_dir }}/fastcgi.conf"
-  when: not conf.stat.exists
-  notify: reload nginx
-
-- name: LINEINFILE | Add fastcgi config
-  lineinfile:
-    line: "fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;"
-    dest: "{{ nginx_etc_dir }}/fastcgi.conf"
-  notify: reload nginx
-
-- name: COPY | Populate proxy_params
-  copy:
-    content: "proxy_set_header Host $http_host;\nproxy_set_header X-Real-IP $remote_addr;\nproxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;proxy_set_header X-Forwarded-Proto $scheme;"
-    dest: "{{ nginx_etc_dir }}/proxy_params"
-
 - name: FILE | Create log directory
   file:
     path: "{{ nginx_log_dir }}"
diff --git a/templates/etc/nginx/sites-available/_backuppc.j2 b/templates/etc/nginx/sites-available/_backuppc.j2
index 9de6a8b..3ead87d 100644
--- a/templates/etc/nginx/sites-available/_backuppc.j2
+++ b/templates/etc/nginx/sites-available/_backuppc.j2
@@ -25,7 +25,7 @@
 {% block template_upstream_location %}
 	location ~ \.cgi$ {
 		gzip off;
-		include {{ nginx_etc_dir }}/fastcgi_params;
+		include fastcgi.conf;
 		fastcgi_pass unix:/var/run/fcgiwrap.socket;
 		fastcgi_index BackupPC_Admin;
 		fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name;
diff --git a/templates/etc/nginx/sites-available/_nagios3.j2 b/templates/etc/nginx/sites-available/_nagios3.j2
index 1487220..e5f22e6 100644
--- a/templates/etc/nginx/sites-available/_nagios3.j2
+++ b/templates/etc/nginx/sites-available/_nagios3.j2
@@ -46,11 +46,7 @@
 	location /cgi-bin {
 {% endif %}
 		try_files $uri =404;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 		fastcgi_pass unix:{{ nginx_fcgiwrap_sock }};
 		fastcgi_param AUTH_USER $remote_user;
 		fastcgi_param REMOTE_USER $remote_user;
@@ -58,10 +54,6 @@
 	location ~ \.php$ {
 		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
diff --git a/templates/etc/nginx/sites-available/_owncloud.j2 b/templates/etc/nginx/sites-available/_owncloud.j2
index 459f03a..7d9ef7b 100644
--- a/templates/etc/nginx/sites-available/_owncloud.j2
+++ b/templates/etc/nginx/sites-available/_owncloud.j2
@@ -42,11 +42,7 @@
 		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
 		fastcgi_param modHeadersAvailable true;
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 
 	location ~ \.php(?:$|/) {
@@ -57,11 +53,7 @@
 		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
 		fastcgi_param modHeadersAvailable true;
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
 
diff --git a/templates/etc/nginx/sites-available/_php.j2 b/templates/etc/nginx/sites-available/_php.j2
index ca368fc..c9b00f0 100644
--- a/templates/etc/nginx/sites-available/_php.j2
+++ b/templates/etc/nginx/sites-available/_php.j2
@@ -29,10 +29,6 @@
 		{{ param }}
 {% endfor %}
 {% endif %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
diff --git a/templates/etc/nginx/sites-available/_php_index.j2 b/templates/etc/nginx/sites-available/_php_index.j2
index 4ee9c33..e4a45c3 100644
--- a/templates/etc/nginx/sites-available/_php_index.j2
+++ b/templates/etc/nginx/sites-available/_php_index.j2
@@ -10,11 +10,7 @@
 		{{ param }}
 {% endfor %}
 {% endif %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
 
diff --git a/templates/etc/nginx/sites-available/_php_index2.j2 b/templates/etc/nginx/sites-available/_php_index2.j2
index 97dd799..1ad0393 100644
--- a/templates/etc/nginx/sites-available/_php_index2.j2
+++ b/templates/etc/nginx/sites-available/_php_index2.j2
@@ -14,10 +14,6 @@
 		{{ param }}
 {% endfor %}
 {% endif %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}