diff --git a/reverse-proxy/loc-includes/csp.conf b/reverse-proxy/loc-includes/csp.conf
deleted file mode 100644
index 673838d27..000000000
--- a/reverse-proxy/loc-includes/csp.conf
+++ /dev/null
@@ -1 +0,0 @@
-add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'self'; form-action 'none'; frame-ancestors 'none';" always;
\ No newline at end of file
diff --git a/reverse-proxy/loc-includes/cors.conf b/reverse-proxy/loc-includes/headers.conf
similarity index 70%
rename from reverse-proxy/loc-includes/cors.conf
rename to reverse-proxy/loc-includes/headers.conf
index 84f1c78c8..d38341d04 100644
--- a/reverse-proxy/loc-includes/cors.conf
+++ b/reverse-proxy/loc-includes/headers.conf
@@ -1,3 +1,11 @@
+add_header X-Content-Type-Options "nosniff" always;
+add_header X-Frame-Options "SAMEORIGIN" always;
+add_header X-XSS-Protection "1; mode=block" always;
+add_header Referrer-Policy "no-referrer" always;
+add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'self'; form-action 'none'; frame-ancestors 'none';" always;
+add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+
+
 # https://enable-cors.org/server_nginx.html
 #
 # Wide-open CORS config for nginx
diff --git a/reverse-proxy/loc-includes/security.conf b/reverse-proxy/loc-includes/security.conf
deleted file mode 100644
index 84f1e815d..000000000
--- a/reverse-proxy/loc-includes/security.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-add_header X-Content-Type-Options "nosniff" always;
-add_header X-Frame-Options "SAMEORIGIN" always;
-add_header X-XSS-Protection "1; mode=block" always;
-add_header Referrer-Policy "no-referrer" always;
\ No newline at end of file
diff --git a/reverse-proxy/loc-includes/ssl.conf b/reverse-proxy/loc-includes/ssl.conf
deleted file mode 100644
index 193e9a158..000000000
--- a/reverse-proxy/loc-includes/ssl.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://ssl-config.mozilla.org/#server=nginx&config=intermediate&ocsp=false
-
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
\ No newline at end of file
diff --git a/reverse-proxy/svr-includes/security.conf b/reverse-proxy/svr-includes/security.conf
index b7a0bcba7..99cc9632e 100644
--- a/reverse-proxy/svr-includes/security.conf
+++ b/reverse-proxy/svr-includes/security.conf
@@ -1 +1,20 @@
-server_tokens off;
\ No newline at end of file
+server_tokens off;
+
+
+# https://ssl-config.mozilla.org/#server=nginx&config=intermediate&ocsp=false
+
+ssl_session_timeout 1d;
+ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
+ssl_session_tickets off;
+
+ssl_dhparam /etc/nginx/cert/dhparam.pem;
+
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+ssl_prefer_server_ciphers off;
+
+
+# https://support.cloudflare.com/hc/en-us/articles/204899617-Authenticated-Origin-Pulls
+
+ssl_client_certificate /etc/nginx/cert/cloudflare.crt;
+ssl_verify_client on;
\ No newline at end of file
diff --git a/reverse-proxy/svr-includes/ssl.conf b/reverse-proxy/svr-includes/ssl.conf
deleted file mode 100644
index ccc340578..000000000
--- a/reverse-proxy/svr-includes/ssl.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# https://ssl-config.mozilla.org/#server=nginx&config=intermediate&ocsp=false
-
-ssl_session_timeout 1d;
-ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
-ssl_session_tickets off;
-
-ssl_dhparam /etc/nginx/cert/dhparam.pem;
-
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-ssl_prefer_server_ciphers off;
-
-
-# https://support.cloudflare.com/hc/en-us/articles/204899617-Authenticated-Origin-Pulls
-
-ssl_client_certificate /etc/nginx/cert/cloudflare.crt;
-ssl_verify_client on;
\ No newline at end of file