diff --git a/monitoring-server.yml b/monitoring-server.yml
index fb5e069..8147381 100644
--- a/monitoring-server.yml
+++ b/monitoring-server.yml
@@ -1,8 +1,8 @@
 - hosts:
   - monitoring-server
 
   roles:
   - influxdb
   - grafana
-  - { role: mon-apache, use_ssl: True }
+  - mon-apache
   - letsencrypt
diff --git a/production/group_vars/all/main.yml b/production/group_vars/all/main.yml
index fe47ca2..6ff8556 100644
--- a/production/group_vars/all/main.yml
+++ b/production/group_vars/all/main.yml
@@ -1,12 +1,14 @@
 ---
 ansible_user: root
 
 # Who has access to all servers
 allowed_ssh_users_common:
 - dfaure
 - toma
 - bcooksley
 - mitchell
 - nalvarez
 - bshah
 - bgupta
+
+enable_ssl: True
diff --git a/roles/mon-apache/templates/status.kde.org.conf b/roles/mon-apache/templates/status.kde.org.conf
index 6d87cd7..7ff5303 100644
--- a/roles/mon-apache/templates/status.kde.org.conf
+++ b/roles/mon-apache/templates/status.kde.org.conf
@@ -1,27 +1,27 @@
 {% extends "apache-vhost.j2" %}
 
 {% block common %}
     ServerAdmin  webmaster@kde.org
     ServerName   {{grafana_hostname}}
     DocumentRoot /srv/www/{{grafana_hostname}}
 
     ErrorLog  ${APACHE_LOG_DIR}/{{grafana_hostname}}-error.log
     CustomLog ${APACHE_LOG_DIR}/{{grafana_hostname}}.log combined
 {% endblock %}
 
 {% block redirect %}
     Redirect / https://{{grafana_hostname}}/
 {% endblock %}
 
 {% block main %}
     # Enable proxying to Grafana, which will do the actual serving
     ProxyRequests Off
     ProxyPass /.well-known/acme-challenge/ !
     ProxyPass / http://127.0.0.1:3000/ retry=0
 {% endblock %}
 
-{% block enable_ssl %}
+{% block ssl %}
     # Enable SSL
     Include /etc/apache2/common/ssl.conf
     Include /etc/apache2/common/ssl-kde-org.conf
 {% endblock %}
diff --git a/templates/apache-vhost.j2 b/templates/apache-vhost.j2
index b6c3b6d..88607ac 100644
--- a/templates/apache-vhost.j2
+++ b/templates/apache-vhost.j2
@@ -1,21 +1,21 @@
-{% if use_ssl|default(False) %}
+{% if enable_ssl|default(False) %}
 <VirtualHost *:80>
 {{ self.common() }}
 
 {{ self.redirect() }}
 </VirtualHost>
 
 <VirtualHost *:443>
 {{ self.common() }}
 
 {{ self.main() }}
 
-{{ self.enable_ssl() }}
+{{ self.ssl() }}
 </VirtualHost>
 {% else %}
 <VirtualHost *:80>
 {{ self.common() }}
 
 {{ self.main() }}
 </VirtualHost>
 {% endif %}