diff --git a/assets/setup/install b/assets/setup/install
index ff468825..adabd4a9 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -54,6 +54,9 @@ sudo -u git -H git clone -q -b v${GITLAB_VERSION} --depth 1 \
 
 cd ${GITLAB_INSTALL_DIR}
 
+# remove HSTS config from the default headers, we configure it in nginx
+sed "/headers\['Strict-Transport-Security'\]/d" -i app/controllers/application_controller.rb
+
 # copy default configurations
 cp lib/support/nginx/gitlab /etc/nginx/sites-enabled/gitlab
 sudo -u git -H cp config/gitlab.yml.example config/gitlab.yml