diff --git a/templates/drone-server.env.j2 b/templates/drone-server.env.j2
index a33963c..f05ce96 100644
--- a/templates/drone-server.env.j2
+++ b/templates/drone-server.env.j2
@@ -70,12 +70,25 @@ AWS_REGION={{ aws_region }}
 DRONE_S3_BUCKET={{ drone_s3_bucket }}
 {% endif %}
 {% if drone_kubernetes_enabled == True %}
-DRONE_KUBERNETES_ENABLED={{ aws_region }}
-DRONE_KUBERNETES_NAMESPACE={{ aws_region }}
-DRONE_KUBERNETES_CONFIG_PATH={{ aws_region }}
-DRONE_KUBERNETES_CONFIG_URL={{ aws_region }}
-DRONE_KUBERNETES_TTL_AFTER_FINISHED={{ aws_region }}
-DRONE_KUBERNETES_SERVICE_ACCOUNT={{ aws_region }}
-DRONE_KUBERNETES_IMAGE_PULL={{ aws_region }}
-DRONE_KUBERNETES_IMAGE={{ aws_region }}
+DRONE_KUBERNETES_ENABLED={{ drone_kubernetes_enabled }}
+DRONE_KUBERNETES_NAMESPACE={{ drone_kubernetes_namespace }}
+DRONE_KUBERNETES_CONFIG_PATH={{ drone_kubernetes_config_path }}
+DRONE_KUBERNETES_CONFIG_URL={{ drone_kubernetes_config_url }}
+DRONE_KUBERNETES_TTL_AFTER_FINISHED={{ drone_kubernetes_ttl_after_finished }}
+DRONE_KUBERNETES_SERVICE_ACCOUNT={{ drone_kubernetes_service_account }}
+DRONE_KUBERNETES_IMAGE_PULL={{ drone_kubernetes_image_pull }}
+DRONE_KUBERNETES_IMAGE={{ drone_kubernetes_image }}
+{% endif %}
+
+{% if drone_cookie_secret is defined %}
+DRONE_COOKIE_SECRET={{ drone_cookie_secret }}
+{% endif %}
+{% if drone_cookie_secure is defined %}
+DRONE_COOKIE_SECURE=true
+{% endif %}
+{% if drone_legacy_token_mapping_file is defined %}
+DRONE_LEGACY_TOKEN_MAPPING_FILE={{ drone_legacy_token_mapping_file }}
+{% endif %}
+{% if drone_cookie_timeout is defined %}
+DRONE_COOKIE_TIMEOUT={{ drone_cookie_timeout }}
 {% endif %}