diff --git a/templates/gitea.ini.j2 b/templates/gitea.ini.j2
index 7ca195c..6d0d033 100644
--- a/templates/gitea.ini.j2
+++ b/templates/gitea.ini.j2
@@ -24,13 +24,15 @@ ENABLE_PUSH_CREATE_USER = {{ gitea_enable_push_create_user | ternary('true', 'fa
 FORCE_PRIVATE           = {{ gitea_force_private | ternary('true', 'false') }}
 MAX_CREATION_LIMIT      = {{ gitea_user_repo_limit }}
 ROOT                    = {{ gitea_repository_root }}
-{% if gitea_repository_extra_config != '' %}{{ gitea_repository_extra_config }}{% else %};{% endif %}
+{{ gitea_repository_extra_config }}
+;
 ;
 [repository.upload]
 TEMP_PATH           = {{ gitea_home }}/data/tmp/uploads
-{% if gitea_repository_upload_extra_config != '' %}{{ gitea_repository_upload_extra_config }}{% else %};{% endif %}
+{{ gitea_repository_upload_extra_config }}
 ;
-;{% if gitea_enable_repo_signing_options | bool %}
+;
+{% if gitea_enable_repo_signing_options | bool %}
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#repository---signing-repositorysigning
 [repository.signing]
 SIGNING_KEY         = {{ gitea_repo_signing_key }}
@@ -41,10 +43,12 @@ DEFAULT_TRUST_MODEL = {{ gitea_repo_default_trust_model }}
 WIKI                = {{ gitea_repo_wiki }}
 CRUD_ACTIONS        = {{ gitea_repo_crud_actions }}
 MERGES              = {{ gitea_repo_merges }}
-{% if gitea_enable_repo_signing_extra != '' %}{{ gitea_enable_repo_signing_extra }}{% else %};{% endif %}
-;{% endif %}
+{{ gitea_enable_repo_signing_extra }}
+;
+{% endif %}
+;
+{% if gitea_enable_cors | bool %}
 ;
-;{% if gitea_enable_cors | bool %}
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#cors-cors
 [cors]
 ENABLED = {{ gitea_enable_cors | ternary('true', 'false') }}
@@ -56,22 +60,24 @@ MAX_AGE           = {{ gitea_cors_max_age }}
 ALLOW_CREDENTIALS = {{ gitea_cors_allow_credentials | ternary('true', 'false') }}
 HEADERS           = {{ gitea_cors_headers }}
 X_FRAME_OPTIONS   = {{ gitea_cors_x_frame_options }}
-{% if gitea_cors_extra != '' %}{{ gitea_cors_extra }}{% else %};{% endif %}
-;{% endif %}
+{{ gitea_cors_extra }}
+;
+{% endif %}
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#ui-ui
 [ui]
 SHOW_USER_EMAIL = {{ gitea_show_user_email | ternary('true', 'false') }}
 DEFAULT_THEME   = {{ gitea_theme_default }}
 THEMES          = {{ gitea_themes }}
-{% if gitea_ui_extra_config != '' %}{{ gitea_ui_extra_config }}{% else %};{% endif %}
+{{ gitea_ui_extra_config }}
+;
 ;
 ;
 [ui.meta]
 AUTHOR      = {{ gitea_ui_author }}
 DESCRIPTION = {{ gitea_ui_description }}
 KEYWORDS    = {{ gitea_ui_keywords }}
-{% if gitea_ui_meta_extra_config != '' %}{{ gitea_ui_meta_extra_config }}{% else %};{% endif %}
+{{ gitea_ui_meta_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#server-server
@@ -91,24 +97,24 @@ LANDING_PAGE          = {{ gitea_landing_page }}
 {% if gitea_lfs_server_enabled | bool -%}
 LFS_START_SERVER      = true
 LFS_JWT_SECRET        = {{ gitea_lfs_jwt_secret }}
-{% endif -%}
+{% endif %}
 REDIRECT_OTHER_PORT   = {{ gitea_redirect_other_port | ternary('true', 'false') }}
 PORT_TO_REDIRECT      = {{ gitea_port_to_redirect }}
-{%- if gitea_enable_tls_certs | bool %}
+{% if gitea_enable_tls_certs | bool %}
 CERT_FILE             = {{ gitea_tls_cert_file }}
 KEY_FILE              = {{ gitea_tls_key_file }}
-{%- endif %}
+{% endif %}
 ENABLE_ACME           = {{ gitea_enable_acme | ternary('true', 'false') }}
-{%- if gitea_enable_acme | bool %}
-{%- if gitea_acme_url != '' %}
+{% if gitea_enable_acme | bool %}
+{% if gitea_acme_url != '' %}
 ACME_URL              = {{ gitea_acme_url }}
-{%- endif %}
+{% endif %}
 ACME_ACCEPTTOS        = {{ gitea_acme_accepttos | ternary('true', 'false') }}
 ACME_DIRECTORY        = {{ gitea_acme_directory }}
 ACME_EMAIL            = {{ gitea_acme_email }}
 ACME_CA_ROOT          = {{ gitea_acme_ca_root }}
-{%- endif %}
-{% if gitea_server_extra_config != '' %}{{ gitea_server_extra_config }}{% else %};{% endif %}
+{% endif %}
+{{ gitea_server_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#database-database
@@ -121,7 +127,7 @@ PASSWD   = {{ gitea_db_password }}
 SSL_MODE = {{ gitea_db_ssl }}
 PATH     = {{ gitea_db_path }}
 LOG_SQL  = {{ gitea_db_log_sql | ternary('true', 'false') }}
-{% if gitea_database_extra_config != '' %}{{ gitea_database_extra_config }}{% else %};{% endif %}
+{{ gitea_database_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#indexer-indexer
@@ -133,14 +139,14 @@ REPO_INDEXER_INCLUDE          = {{ gitea_repo_indexer_include }}
 REPO_INDEXER_EXCLUDE          = {{ gitea_repo_indexer_exclude }}
 REPO_INDEXER_EXCLUDE_VENDORED = {{ gitea_repo_exclude_vendored | ternary('true', 'false') }}
 MAX_FILE_SIZE                 = {{ gitea_repo_indexer_max_file_size }}
-{% if gitea_indexer_extra_config != '' %}{{ gitea_indexer_extra_config }}{% else %};{% endif %}
+{{ gitea_indexer_extra_config }}
 ;
 ;
 ; Queue (queue and queue.*)
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#queue-queue-and-queue
 [queue.issue_indexer]
 DATADIR = {{ gitea_home }}/indexers/issues.queue
-{% if  gitea_queue_issue_indexer_extra_config != '' %}{{ gitea_queue_issue_indexer_extra_config }}{% else %};{% endif %}
+{{ gitea_queue_issue_indexer_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#security-security
@@ -151,7 +157,7 @@ DISABLE_GIT_HOOKS   = {{ gitea_disable_git_hooks | ternary('true', 'false') }}
 DISABLE_WEBHOOKS    = { gitea_disable_webhooks | ternary('true', 'false') }
 INTERNAL_TOKEN      = {{ gitea_internal_token }}
 PASSWORD_CHECK_PWN  = {{ gitea_password_check_pwn | ternary('true', 'false') }}
-{% if gitea_security_extra_config != '' %}{{ gitea_security_extra_config }}{% else %};{% endif %}
+{{ gitea_security_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#service-service
@@ -165,21 +171,21 @@ SHOW_REGISTRATION_BUTTON          = {{ gitea_show_registration_button | ternary(
 ALLOW_ONLY_EXTERNAL_REGISTRATION  = {{ gitea_only_allow_external_registration | ternary('true', 'false') }}
 ENABLE_NOTIFY_MAIL                = {{ gitea_enable_notify_mail | ternary('true', 'false') }}
 AUTO_WATCH_NEW_REPOS              = {{ gitea_auto_watch_new_repos | ternary('true', 'false') }}
-{% if gitea_service_extra_config  != '' %}{{ gitea_service_extra_config }}{% else %};{% endif %}
+{{ gitea_service_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#mailer-mailer
 [mailer]
 ENABLED                 = {{ gitea_mailer_enabled | ternary('true', 'false') }}
-{%- if gitea_mailer_enabled | bool %}
+{% if gitea_mailer_enabled | bool %}
 PROTOCOL                = {{ gitea_mailer_protocol }}
 SMTP_ADDR               = {{ gitea_mailer_smtp_addr }}
 SMTP_PORT               = {{ gitea_mailer_smtp_port }}
 USE_CLIENT_CERT         = {{ gitea_mailer_use_client_cert | ternary('true', 'false') }}
-{%- if gitea_mailer_use_client_cert | bool %}
+{% if gitea_mailer_use_client_cert | bool %}
 CLIENT_CERT_FILE        = {{ gitea_mailer_client_cert_file }}
 CLIENT_KEY_FILE         = {{ gitea_mailer_client_key_file }}
-{%- endif %}
+{% endif %}
 FORCE_TRUST_SERVER_CERT = {{ gitea_mailer_force_trust_server_cert | ternary('true', 'false') }}
 USER                    = {{ gitea_mailer_user }}
 PASSWD                  = `{{ gitea_mailer_password }}`
@@ -187,28 +193,29 @@ ENABLE_HELO             = {{ gitea_mailer_enable_helo | ternary('true', 'false')
 FROM                    = {{ gitea_mailer_from }}
 SUBJECT_PREFIX          = {{ gitea_subject_prefix }}
 SEND_AS_PLAIN_TEXT      = {{ gitea_mailer_send_as_plaintext | ternary('true', 'false') }}
-{% if gitea_mailer_extra_config != '' %}{{ gitea_mailer_extra_config }}{% else %};{% endif %}
-{%- endif %}
+{{ gitea_mailer_extra_config }}
+;
+{% endif %}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#session-session
 [session]
 PROVIDER        = {{ gitea_session_provider }}
 PROVIDER_CONFIG = {{ gitea_home }}/data/sessions
-{% if gitea_session_extra_config != '' %}{{ gitea_session_extra_config }}{% else %};{% endif %}
+{{ gitea_session_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture
 [picture]
 AVATAR_UPLOAD_PATH = {{ gitea_home }}/data/avatars
-{% if gitea_picture_extra_config != '' %}{{ gitea_picture_extra_config }}{% else %};{% endif %}
+{{ gitea_picture_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#issue-and-pull-request-attachments-attachment
 [attachment]
 ENABLED = {{ gitea_attachment_enabled | ternary('true', 'false') }}
 PATH    = {{ gitea_home }}/data/attachments
-{% if gitea_attachment_extra_config != '' %}{{ gitea_attachment_extra_config }}{% else %};{% endif %}
+{{ gitea_attachment_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#log-log
@@ -220,48 +227,48 @@ MODE       = console
 MODE       = file
 {% endif %}
 LEVEL      = {{ gitea_log_level }}
-{% if gitea_log_extra_config != '' %}{{ gitea_log_extra_config }}{% else %};{% endif %}
+{{ gitea_log_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#metrics-metrics
 [metrics]
 ENABLED = {{ gitea_metrics_enabled | ternary('true', 'false') }}
 TOKEN   = {{ gitea_metrics_token }}
-{% if gitea_metrics_extra != '' %}{{ gitea_metrics_extra }}{% else %};{% endif %}
+{{ gitea_metrics_extra }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#oauth2-oauth2
 [oauth2]
 ENABLE     = {{ gitea_oauth2_enabled | ternary('true', 'false') }}
 JWT_SECRET = {{ gitea_oauth2_jwt_secret }}
-{% if gitea_oauth2_extra_config != '' %}{{ gitea_oauth2_extra_config }}{% else %};{% endif %}
+{{ gitea_oauth2_extra_config }}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#federation-federation
 [federation]
 ENABLED               = {{ gitea_federation_enabled | ternary('true', 'false') }}
 SHARE_USER_STATISTICS = {{ gitea_federation_share_user_stats | ternary('true', 'false') }}
-{% if gitea_federation_extra != '' %}{{ gitea_federation_extra }}{% else %};{% endif %}
+{{ gitea_federation_extra }}
 ;
 ;
 ; Packages (packages)
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#packages-packages
 [packages]
 ENABLED             = {{ gitea_packages_enabled | ternary('true', 'false') }}
-{%- if gitea_packages_enabled | bool %}
+{% if gitea_packages_enabled | bool %}
 CHUNKED_UPLOAD_PATH = {{ gitea_home }}/data/tmp/package-upload
-{% if gitea_packages_extra != '' %}{{ gitea_packages_extra }}{% else %};{% endif %}
-;{% endif %}
+{{ gitea_packages_extra }}
+{% endif %}
 ;
 ;
-{%- if gitea_lfs_server_enabled | bool %}
+{% if gitea_lfs_server_enabled | bool %}
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#lfs-lfs
 [lfs]
 STORAGE_TYPE  = {{ gitea_lfs_storage_type }}
 SERVE_DIRECT  = {{ gitea_lfs_serve_direct | ternary('true', 'false') }}
 PATH          = {{ gitea_lfs_content_path }}
-{% if gitea_lfs_extra != '' %}{{ gitea_lfs_extra }}{% else %};{% endif %}
-{%- endif %}
+{{ gitea_lfs_extra }}
+{% endif %}
 ;
 ;
 ; Other (other)
diff --git a/vars/main.yml b/vars/main.yml
index a00109c..fe6297c 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -56,5 +56,5 @@ transfer_custom_footer:
     - 'files/gitea_footer/extra_links_footer.tmpl'
     - 'files/extra_links_footer.tmpl'
 
-playbook_version_number: 39  # should be int
+playbook_version_number: 40  # should be int
 playbook_version_path: 'do1jlr.gitea.version'