diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2
index bdc0fe7f57e9cc8488a100661fcaae6b5cf0827c..a372863fb9a7307a960d1e292de57be4e0510272 100644
--- a/templates/gitlab.rb.j2
+++ b/templates/gitlab.rb.j2
@@ -674,7 +674,7 @@ gitlab_rails['registry_path'] = "{{ gitlab.registry_path }}"
 # registry['gid'] = nil
 # registry['dir'] = "/var/opt/gitlab/registry"
 # registry['registry_http_addr'] = "localhost:5000"
-# registry['debug_addr'] = "localhost:5001"
+registry['debug_addr'] = "localhost:5001"
 # registry['log_directory'] = "/var/log/gitlab/registry"
 # registry['env_directory'] = "/opt/gitlab/etc/registry/env"
 # registry['env'] = {
@@ -1434,10 +1434,10 @@ gitlab_pages['use_http2'] = true
 # gitlab_pages['inplace_chroot'] = false
 
 ##! Prometheus metrics for Pages docs: https://gitlab.com/gitlab-org/gitlab-pages/#enable-prometheus-metrics
-# gitlab_pages['metrics_address'] = ":9235"
+gitlab_pages['metrics_address'] = "[::1]:9235"
 
 ##! Specifies the minimum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2")
-# gitlab_pages['tls_min_version'] = "ssl3"
+# gitlab_pages['tls_min_version'] = "tls1.2"
 
 ##! Specifies the maximum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2")
 # gitlab_pages['tls_max_version'] = "tls1.2"
@@ -1767,7 +1767,7 @@ registry_nginx['enable'] = false
 ##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source
 ################################################################################
 
-# grafana['enable'] = true
+grafana['enable'] = false
 # grafana['log_directory'] = '/var/log/gitlab/grafana'
 # grafana['home'] = '/var/opt/gitlab/grafana'
 # grafana['admin_password'] = 'admin'