diff --git a/defaults/main.yml b/defaults/main.yml
index 603a810..fe15c84 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,7 +2,6 @@
 drone_server_enable: "false"
 drone_agent_enable: "false"
 drone_version: "latest"
-drone_tls_autocert: "false"
 drone_agents_enabled: "true"
 drone_logs_pretty: "true"
 drone_logs_color: "true"
diff --git a/templates/drone-server.env.j2 b/templates/drone-server.env.j2
index b652165..f8e2600 100644
--- a/templates/drone-server.env.j2
+++ b/templates/drone-server.env.j2
@@ -4,7 +4,9 @@ DRONE_SERVER_HOST={{ drone_server_host }}
 {% if drone_server_proto is defined %}
 DRONE_SERVER_PROTO={{ drone_server_proto }}
 {% endif %}
-DRONE_TLS_AUTOCERT=false
+{% if drone_tls_autocert is defined %}
+DRONE_TLS_AUTOCERT={{ drone_tls_autocert }}
+{% endif %}
 {% if drone_rpc_secret is defined %}
 DRONE_RPC_SECRET={{ drone_rpc_secret }}
 {% endif %}