diff --git a/templates/server.env.j2 b/templates/server.env.j2
index a4d8658..a790dba 100644
--- a/templates/server.env.j2
+++ b/templates/server.env.j2
@@ -8,14 +8,14 @@ WOODPECKER_REPO_OWNERS={{ woodpecker_repo_owners | default(None) }}
 WOODPECKER_HOST={{ woodpecker_host }}
 WOODPECKER_AGENT_SECRET={{ woodpecker_agent_secret }}
 
-{%- if woodpecker_database_driver is defined -%}
+{% if woodpecker_database_driver is defined %}
 WOODPECKER_DATABASE_DRIVER={{ woodpecker_database_driver }}
 WOODPECKER_DATABASE_DATASOURCE={{ woodpecker_database_datasource }}
-{% endif %}
+{%- endif -%}
 
-{%- if woodpecker_docker_config_path is defined -%}
+{% if woodpecker_docker_config_path is defined %}
 WOODPECKER_DOCKER_CONFIG={{ woodpecker_docker_config_path }}
-{% endif %}
+{%- endif -%}
 
 {% if woodpecker_github %}
 WOODPECKER_GITHUB=true
@@ -29,7 +29,7 @@ WOODPECKER_GITHUB_PRIVATE_MODE={{ woodpecker_github_private_mode | default(None)
 WOODPECKER_GITHUB_MERGE_REF={{ woodpecker_github_merge_ref | default(None) }}
 WOODPECKER_GITHUB_CONTEXT={{ woodpecker_github_context | default(None) }}
 WOODPECKER_GITHUB_SKIP_VERIFY={{ woodpecker_github_skip_verify | default(None) }}
-{% endif %}
+{%- endif -%}
 
 {% if woodpecker_gitea %}
 WOODPECKER_GITEA=true
@@ -41,7 +41,7 @@ WOODPECKER_GITEA_GIT_USERNAME={{ woodpecker_gitea_git_username | default(None) }
 WOODPECKER_GITEA_GIT_PASSWORD={{ woodpecker_gitea_git_password | default(None) }}
 WOODPECKER_GITEA_PRIVATE_MODE={{ woodpecker_gitea_private_mode | default(None) }}
 WOODPECKER_GITEA_SKIP_VERIFY={{ woodpecker_gitea_skip_verify | default(None) }}
-{% endif %}
+{%- endif -%}
 
 {% if woodpecker_gitlab %}
 WOODPECKER_GITLAB=true
@@ -53,13 +53,13 @@ WOODPECKER_GITLAB_GIT_USERNAME={{ woodpecker_gitlab_git_username | default(None)
 WOODPECKER_GITLAB_GIT_PASSWORD={{ woodpecker_gitlab_git_password | default(None) }}
 WOODPECKER_GITLAB_PRIVATE_MODE={{ woodpecker_gitlab_private_mode | default(None) }}
 WOODPECKER_GITLAB_SKIP_VERIFY={{ woodpecker_gitlab_skip_verify | default(None) }}
-{% endif %}
+{%- endif -%}
 
 {% if woodpecker_bitbucket %}
 WOODPECKER_BITBUCKET=true
 WOODPECKER_BITBUCKET_CLIENT={{ woodpecker_bitbucket_client }}
 WOODPECKER_BITBUCKET_SECRET={{ woodpecker_bitbucket_secret }}
-{% endif %}
+{%- endif -%}
 
 {% if woodpecker_bitbucket_server %}
 WOODPECKER_STASH=true
@@ -69,4 +69,4 @@ WOODPECKER_STASH_CONSUMER_RSA={{ woodpecker_bitbucket_server_consumer_rsa }}
 WOODPECKER_STASH_CONSUMER_RSA_STRING={{ woodpecker_bitbucket_server_consumer_rsa_string | default(None) }}
 WOODPECKER_STASH_GIT_USERNAME={{ woodpecker_bitbucket_server_git_username }}
 WOODPECKER_STASH_GIT_PASSWORD={{ woodpecker_bitbucket_server_git_password }}
-{% endif %}
+{%- endif -%}