diff --git a/README.md b/README.md
index 075f381..8158022 100644
--- a/README.md
+++ b/README.md
@@ -197,9 +197,7 @@ Default value : system, exec, shell_exec, passthru, phpinfo, show_source, highli
 List of PHP functions blacklisted. They can't be used anywhere in PHP code.
 
 ## TODO
-- run php7-fpm as nginx
 - Edit CONTENT_SECURITY_POLICY default value
-- Possibility to disable stuff with "free" values
 - Custom TLS certificates
 - Documentation
 - Certificate Transparency
diff --git a/confs/nginx.conf b/confs/nginx.conf
index d504a60..959e80a 100644
--- a/confs/nginx.conf
+++ b/confs/nginx.conf
@@ -70,6 +70,9 @@ http {
 	# disable default server
 	%DISABLE_DEFAULT_SERVER%
 
+	# redirect HTTP to HTTPS
+	%REDIRECT_HTTP_TO_HTTPS%
+
 	# geoip2 config
 	geoip2 /etc/nginx/geoip.mmdb {
 		auto_reload 5m;
diff --git a/confs/redirect-http-to-https.conf b/confs/redirect-http-to-https.conf
new file mode 100644
index 0000000..d7fc0e8
--- /dev/null
+++ b/confs/redirect-http-to-https.conf
@@ -0,0 +1,5 @@
+server {
+	listen 80;
+	server_name %SERVER_NAME%;
+	return 301 https://$host$request_uri;
+}
diff --git a/entrypoint.sh b/entrypoint.sh
index a69069d..6cdea52 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -19,48 +19,49 @@ cp /opt/confs/php.ini /etc/php7/php.ini
 echo "" > /etc/crontabs/root
 
 # set default values
-MAX_CLIENT_SIZE="${MAX_CLIENT_SIZE:-10m}"
-SERVER_TOKENS="${SERVER_TOKENS:-off}"
-CACHE="${CACHE:-max=1000 inactive=60s}"
-CACHE_ERRORS="${CACHE_ERRORS:-on}"
-CACHE_USES="${CACHE_USES:-1}"
-CACHE_VALID="${CACHE_VALID:-60s}"
-#CLIENT_CACHE="${CLIENT_CACHE}:-css|gif|htm|html|ico|jpeg|jpg|js|png|svg|tif|tiff|eot|otf|ttf|woff|woff2"
-#CLIENT_CACHE_EXPIRES="${CLIENT_CACHE_EXPIRES}:-1d}"
+MAX_CLIENT_SIZE="${MAX_CLIENT_SIZE-10m}"
+SERVER_TOKENS="${SERVER_TOKENS-off}"
+CACHE="${CACHE-max=1000 inactive=60s}"
+CACHE_ERRORS="${CACHE_ERRORS-on}"
+CACHE_USES="${CACHE_USES-1}"
+CACHE_VALID="${CACHE_VALID-60s}"
+#CLIENT_CACHE="${CLIENT_CACHE}-css|gif|htm|html|ico|jpeg|jpg|js|png|svg|tif|tiff|eot|otf|ttf|woff|woff2"
+#CLIENT_CACHE_EXPIRES="${CLIENT_CACHE_EXPIRES}-1d}"
 #CLIENT_CACHE_CONTROL=
-USE_GZIP="${USE_GZIP:-off}"
-GZIP_COMP_LEVEL="${GZIP_COMP_LEVEL:-6}"
-GZIP_MIN_LENGTH="${GZIP_MIN_LENGTH:-10240}"
-GZIP_TYPES="${GZIP_TYPES:-text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml application/atom+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml}"
-USE_PHP="${USE_PHP:-yes}"
-HEADER_SERVER="${HEADER_SERVER:-no}"
-X_FRAME_OPTIONS="${X_FRAME_OPTIONS:-DENY}"
-X_XSS_PROTECTION="${X_XSS_PROTECTION:-1; mode=block}"
-X_CONTENT_TYPE_OPTIONS="${X_CONTENT_TYPE_OPTIONS:-nosniff}"
-REFERRER_POLICY="${REFERRER_POLICY:-no-referrer}"
-FEATURE_POLICY="${FEATURE_POLICY:-accelerometer 'none'; ambient-light-sensor 'none'; autoplay 'none'; camera 'none'; display-capture 'none'; document-domain 'none'; encrypted-media 'none'; fullscreen 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; midi 'none'; payment 'none'; picture-in-picture 'none'; speaker 'none'; sync-xhr 'none'; usb 'none'; vibrate 'none'; vr 'none'}"
-DISABLE_DEFAULT_SERVER="${DISABLE_DEFAULT_SERVER:-no}"
-SERVER_NAME="${SERVER_NAME:-www.bunkerity.io}"
-ALLOWED_METHODS="${ALLOWED_METHODS:-GET|POST|HEAD}"
-BLOCK_COUNTRY="${BLOCK_COUNTRY:-}"
-BLOCK_USER_AGENT="${BLOCK_USER_AGENT:-yes}"
-BLOCK_TOR_EXIT_NODE="${BLOCK_TOR_EXIT_NODE:-no}"
-AUTO_LETS_ENCRYPT="${AUTO_LETS_ENCRYPT:-no}"
-HTTP2="${HTTP2:-yes}"
-STRICT_TRANSPORT_SECURITY="${STRICT_TRANSPORT_SECURITY:-max-age=31536000}"
-PHP_EXPOSE="${PHP_EXPOSE:-no}"
-PHP_DISPLAY_ERRORS="${PHP_DISPLAY_ERRORS:-no}"
-PHP_OPEN_BASEDIR="${PHP_OPEN_BASEDIR:-/www/:/tmp/}"
-PHP_ALLOW_URL_FOPEN="${PHP_ALLOW_URL_FOPEN:-no}"
-PHP_ALLOW_URL_INCLUDE="${PHP_ALLOW_URL_INCLUDE:-no}"
-PHP_FILE_UPLOADS="${PHP_FILE_UPLOADS:-yes}"
-PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-10M}"
-PHP_DISABLE_FUNCTIONS="${PHP_DISABLE_FUNCTIONS:-system, exec, shell_exec, passthru, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, putenv, chdir, mkdir, rmdir, chmod, rename, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo}"
-USE_MODSECURITY="${USE_MODSECURITY:-yes}"
-CONTENT_SECURITY_POLICY="${CONTENT_SECURITY_POLICY:-default-src 'self'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests; block-all-mixed-content; sandbox allow-forms allow-same-origin allow-scripts; reflected-xss block; base-uri 'self'; referrer no-referrer}"
-COOKIE_FLAGS="${COOKIE_FLAGS:-* HttpOnly}"
-SERVE_FILES="${SERVE_FILES:-yes}"
-WRITE_ACCESS="${WRITE_ACCESS:-no}"
+USE_GZIP="${USE_GZIP-off}"
+GZIP_COMP_LEVEL="${GZIP_COMP_LEVEL-6}"
+GZIP_MIN_LENGTH="${GZIP_MIN_LENGTH-10240}"
+GZIP_TYPES="${GZIP_TYPES-text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml application/atom+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml}"
+USE_PHP="${USE_PHP-yes}"
+HEADER_SERVER="${HEADER_SERVER-no}"
+X_FRAME_OPTIONS="${X_FRAME_OPTIONS-DENY}"
+X_XSS_PROTECTION="${X_XSS_PROTECTION-1; mode=block}"
+X_CONTENT_TYPE_OPTIONS="${X_CONTENT_TYPE_OPTIONS-nosniff}"
+REFERRER_POLICY="${REFERRER_POLICY-no-referrer}"
+FEATURE_POLICY="${FEATURE_POLICY-accelerometer 'none'; ambient-light-sensor 'none'; autoplay 'none'; camera 'none'; display-capture 'none'; document-domain 'none'; encrypted-media 'none'; fullscreen 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; midi 'none'; payment 'none'; picture-in-picture 'none'; speaker 'none'; sync-xhr 'none'; usb 'none'; vibrate 'none'; vr 'none'}"
+DISABLE_DEFAULT_SERVER="${DISABLE_DEFAULT_SERVER-no}"
+SERVER_NAME="${SERVER_NAME-www.bunkerity.com}"
+ALLOWED_METHODS="${ALLOWED_METHODS-GET|POST|HEAD}"
+BLOCK_COUNTRY="${BLOCK_COUNTRY-}"
+BLOCK_USER_AGENT="${BLOCK_USER_AGENT-yes}"
+BLOCK_TOR_EXIT_NODE="${BLOCK_TOR_EXIT_NODE-no}"
+AUTO_LETS_ENCRYPT="${AUTO_LETS_ENCRYPT-no}"
+HTTP2="${HTTP2-yes}"
+STRICT_TRANSPORT_SECURITY="${STRICT_TRANSPORT_SECURITY-max-age=31536000}"
+PHP_EXPOSE="${PHP_EXPOSE-no}"
+PHP_DISPLAY_ERRORS="${PHP_DISPLAY_ERRORS-no}"
+PHP_OPEN_BASEDIR="${PHP_OPEN_BASEDIR-/www/:/tmp/}"
+PHP_ALLOW_URL_FOPEN="${PHP_ALLOW_URL_FOPEN-no}"
+PHP_ALLOW_URL_INCLUDE="${PHP_ALLOW_URL_INCLUDE-no}"
+PHP_FILE_UPLOADS="${PHP_FILE_UPLOADS-yes}"
+PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE-10M}"
+PHP_DISABLE_FUNCTIONS="${PHP_DISABLE_FUNCTIONS-system, exec, shell_exec, passthru, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, putenv, chdir, mkdir, rmdir, chmod, rename, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo}"
+USE_MODSECURITY="${USE_MODSECURITY-yes}"
+CONTENT_SECURITY_POLICY="${CONTENT_SECURITY_POLICY-default-src 'self'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests; block-all-mixed-content; sandbox allow-forms allow-same-origin allow-scripts; reflected-xss block; base-uri 'self'; referrer no-referrer}"
+COOKIE_FLAGS="${COOKIE_FLAGS-* HttpOnly}"
+SERVE_FILES="${SERVE_FILES-yes}"
+WRITE_ACCESS="${WRITE_ACCESS-no}"
+REDIRECT_HTTP_TO_HTTPS="${REDIRECT_HTTP_TO_HTTPS-no}"
 
 # install additional modules if needed
 if [ "$ADDITIONAL_MODULES" != "" ] ; then
@@ -204,6 +205,13 @@ else
 	replace_in_file "/etc/nginx/server.conf" "%LISTEN_HTTP%" "listen 0.0.0.0:80;"
 fi
 
+# TODO : only do this if TLS is used
+if [ "$REDIRECT_HTTP_TO_HTTPS" = "yes" ] ; then
+	replace_in_file "/etc/nginx/nginx.conf" "%REDIRECT_HTTP_TO_HTTPS%" "include /etc/nginx/redirect-http-to-https.conf;"
+else
+	replace_in_file "/etc/nginx/nginx.conf" "%REDIRECT_HTTP_TO_HTTPS%" ""
+fi
+
 if [ "$USE_MODSECURITY" = "yes" ] ; then
 	replace_in_file "/etc/nginx/nginx.conf" "%USE_MODSECURITY%" "include /etc/nginx/modsecurity.conf;"
 else
@@ -253,6 +261,8 @@ fi
 
 # start PHP
 if [ "$USE_PHP" = "yes" ] ; then
+	replace_in_file "/etc/php7/php-fpm.d/www.conf" "user = nobody" "user = nginx"
+	replace_in_file "/etc/php7/php-fpm.d/www.conf" "group = nobody" "group = nginx"
 	php-fpm7
 fi
 
diff --git a/scripts/certbot-renew.sh b/scripts/certbot-renew.sh
index 264f913..171bebe 100644
--- a/scripts/certbot-renew.sh
+++ b/scripts/certbot-renew.sh
@@ -1,7 +1,30 @@
 #!/bin/sh
 
+function replace_in_file() {
+	# escape slashes
+	pattern=$(echo "$2" | sed "s/\//\\\\\//g")
+	replace=$(echo "$3" | sed "s/\//\\\\\//g")
+	sed -i "s/$pattern/$replace/g" "$1"
+}
+
+# check if HTTP to HTTPS is enabled
+# then disable it temporarily
+if [ grep -q "include /etc/nginx/redirect-http-to-https.conf;" "/etc/nginx/nginx.conf" ] ; then
+	replace_in_file "/etc/nginx/nginx.conf" "include /etc/nginx/redirect-http-to-https.conf;" "#include /etc/nginx/redirect-http-to-https.conf;"
+	if [ -f /run/nginx/nginx.pid ] ; then
+		/usr/sbin/nginx -s reload
+	fi
+fi
+
+# ask a new certificate if needed
 certbot renew
 
+# enable HTTP to HTTPS if needed
+if [ grep -q "#include /etc/nginx/redirect-http-to-https.conf;" "/etc/nginx/nginx.conf" ] ; then
+	replace_in_file "/etc/nginx/nginx.conf" "#include /etc/nginx/redirect-http-to-https.conf;" "include /etc/nginx/redirect-http-to-https.conf;"
+fi
+
+# reload nginx
 if [ -f /run/nginx/nginx.pid ] ; then
 	/usr/sbin/nginx -s reload
 fi