diff --git a/charts/incubator/weblate/Chart.yaml b/charts/incubator/weblate/Chart.yaml
index bdf4c7d5374..ae21c9a29ee 100644
--- a/charts/incubator/weblate/Chart.yaml
+++ b/charts/incubator/weblate/Chart.yaml
@@ -28,7 +28,7 @@ sources:
 - https://github.com/WeblateOrg/docker
 - https://github.com/WeblateOrg/docker-compose
 - https://docs.weblate.org/en/latest/
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/weblate/questions.yaml b/charts/incubator/weblate/questions.yaml
index 423eeaf2684..c9def55ec0e 100644
--- a/charts/incubator/weblate/questions.yaml
+++ b/charts/incubator/weblate/questions.yaml
@@ -395,7 +395,7 @@ questions:
             description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
             schema:
               type: boolean
-              default: true
+              default: false
           - variable: WEBLATE_BASIC_LANGUAGES
             label: "WEBLATE_BASIC_LANGUAGES (Leave empty for default)"
             description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
@@ -653,413 +653,478 @@ questions:
           additional_attrs: true
           type: dict
           attrs:
-          - variable: enabled
-            label: "Show Authentication Settings"
+          - variable: ldap
+            label: "LDAP Authentication Configuration"
             schema:
-              type: boolean
-              default: false
-              show_subquestions_if: true
-              subquestions:
-                - variable: enabledldap
-                  label: "Show LDAP Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_AUTH_LDAP_SERVER_URI
-                        label: "WEBLATE_AUTH_LDAP_SERVER_URI (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_USER_DN_TEMPLATE
-                        label: "WEBLATE_AUTH_LDAP_USER_DN_TEMPLATE (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_USER_ATTR_MAP
-                        label: "WEBLATE_AUTH_LDAP_USER_ATTR_MAP (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_BIND_DN
-                        label: "WEBLATE_AUTH_LDAP_BIND_DN (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_BIND_PASSWORD
-                        label: "WEBLATE_AUTH_LDAP_BIND_PASSWORD (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS
-                        label: "WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: boolean
-                          default: false
-                      - variable: WEBLATE_AUTH_LDAP_USER_SEARCH
-                        label: "WEBLATE_AUTH_LDAP_USER_SEARCH (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_FILTER
-                        label: "WEBLATE_AUTH_LDAP_USER_SEARCH_FILTER (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_UNION
-                        label: "WEBLATE_AUTH_LDAP_USER_SEARCH_UNION (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_UNION_DELIMITER
-                        label: "WEBLATE_AUTH_LDAP_USER_SEARCH_UNION_DELIMITER (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                - variable: enabledgithub
-                  label: "Show Github Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_NAME
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_NAME (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_ID
-                        label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_ID (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledbitbucket
-                  label: "Show Bitbucket Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_BITBUCKET_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_BITBUCKET_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_BITBUCKET_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_BITBUCKET_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledfacebook
-                  label: "Show Facebook Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_FACEBOOK_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_FACEBOOK_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_FACEBOOK_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_FACEBOOK_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledgoogle
-                  label: "Show Google Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS
-                        label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS
-                        label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                - variable: enabledgitlab
-                  label: "Show Gitlab Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_GITLAB_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_GITLAB_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITLAB_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_GITLAB_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_GITLAB_API_URL
-                        label: "WEBLATE_SOCIAL_AUTH_GITLAB_API_URL (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                - variable: enabledazure
-                  label: "Show Azure AD Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledazuretenant
-                  label: "Show Azure AD with Tenant Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_TENANT_ID
-                        label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_TENANT_ID (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledkeycloak
-                  label: "Show Keycloak Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_SECRET
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_PUBLIC_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_PUBLIC_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_ALGORITHM
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_ALGORITHM (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_AUTHORIZATION_URL
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_AUTHORIZATION_URL (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL
-                        label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                - variable: enabledlinux
-                  label: "Show Linux Vendors Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_FEDORA
-                        label: "WEBLATE_SOCIAL_AUTH_FEDORA"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: boolean
-                          default: false
-                      - variable: WEBLATE_SOCIAL_AUTH_OPENSUSE
-                        label: "WEBLATE_SOCIAL_AUTH_OPENSUSE)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: boolean
-                          default: false
-                      - variable: WEBLATE_SOCIAL_AUTH_UBUNTU
-                        label: "WEBLATE_SOCIAL_AUTH_UBUNTU"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: boolean
-                          default: false
-                - variable: enabledslack
-                  label: "Show Slack Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SOCIAL_AUTH_SLACK_KEY
-                        label: "WEBLATE_SOCIAL_AUTH_SLACK_KEY (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: SOCIAL_AUTH_SLACK_SECRET
-                        label: "SOCIAL_AUTH_SLACK_SECRET (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                - variable: enabledsaml
-                  label: "Show SAML Authentication Settings"
-                  schema:
-                    type: boolean
-                    default: false
-                    show_subquestions_if: true
-                    subquestions:
-                      - variable: WEBLATE_SAML_IDP_ENTITY_ID
-                        label: "WEBLATE_SAML_IDP_ENTITY_ID (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
-                      - variable: WEBLATE_SAML_IDP_URL
-                        label: "WEBLATE_SAML_IDP_URL (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          default: ""
-                      - variable: WEBLATE_SAML_IDP_X509CERT
-                        label: "WEBLATE_SAML_IDP_X509CERT (Leave empty for default)"
-                        description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
-                        schema:
-                          type: string
-                          private: true
-                          default: ""
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show LDAP Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_AUTH_LDAP_SERVER_URI
+                      label: "WEBLATE_AUTH_LDAP_SERVER_URI (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_USER_DN_TEMPLATE
+                      label: "WEBLATE_AUTH_LDAP_USER_DN_TEMPLATE (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_USER_ATTR_MAP
+                      label: "WEBLATE_AUTH_LDAP_USER_ATTR_MAP (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_BIND_DN
+                      label: "WEBLATE_AUTH_LDAP_BIND_DN (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_BIND_PASSWORD
+                      label: "WEBLATE_AUTH_LDAP_BIND_PASSWORD (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS
+                      label: "WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: WEBLATE_AUTH_LDAP_USER_SEARCH
+                      label: "WEBLATE_AUTH_LDAP_USER_SEARCH (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_FILTER
+                      label: "WEBLATE_AUTH_LDAP_USER_SEARCH_FILTER (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_UNION
+                      label: "WEBLATE_AUTH_LDAP_USER_SEARCH_UNION (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_AUTH_LDAP_USER_SEARCH_UNION_DELIMITER
+                      label: "WEBLATE_AUTH_LDAP_USER_SEARCH_UNION_DELIMITER (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+          - variable: github
+            label: "Github Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Github Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_ORG_NAME
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_ORG_NAME (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_ID
+                      label: "WEBLATE_SOCIAL_AUTH_GITHUB_TEAM_ID (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: bitbucket
+            label: "Bitbucket Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Bitbucket Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_BITBUCKET_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_BITBUCKET_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_BITBUCKET_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_BITBUCKET_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: facebook
+            label: "Facebook Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Facebook Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_FACEBOOK_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_FACEBOOK_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_FACEBOOK_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_FACEBOOK_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: google
+            label: "Google Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Google Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS
+                      label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS
+                      label: "WEBLATE_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+          - variable: gitlab
+            label: "Gitlab Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Gitlab Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_GITLAB_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_GITLAB_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITLAB_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_GITLAB_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_GITLAB_API_URL
+                      label: "WEBLATE_SOCIAL_AUTH_GITLAB_API_URL (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+          - variable: azure
+            label: "Azure AD Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Azure AD Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: azuretenant
+            label: "Azure AD with Tenant Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Azure AD with Tenant Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_TENANT_ID
+                      label: "WEBLATE_SOCIAL_AUTH_AZUREAD_TENANT_OAUTH2_TENANT_ID (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: keycloak
+            label: "Keycloak Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Keycloak Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_SECRET
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_PUBLIC_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_PUBLIC_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_ALGORITHM
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_ALGORITHM (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_AUTHORIZATION_URL
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_AUTHORIZATION_URL (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL
+                      label: "WEBLATE_SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+          - variable: linux
+            label: "Linux Vendors Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Linux Vendors Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_FEDORA
+                      label: "WEBLATE_SOCIAL_AUTH_FEDORA"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: WEBLATE_SOCIAL_AUTH_OPENSUSE
+                      label: "WEBLATE_SOCIAL_AUTH_OPENSUSE)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: WEBLATE_SOCIAL_AUTH_UBUNTU
+                      label: "WEBLATE_SOCIAL_AUTH_UBUNTU"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: boolean
+                        default: false
+          - variable: slack
+            label: "Slack Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show Slack Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SOCIAL_AUTH_SLACK_KEY
+                      label: "WEBLATE_SOCIAL_AUTH_SLACK_KEY (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: SOCIAL_AUTH_SLACK_SECRET
+                      label: "SOCIAL_AUTH_SLACK_SECRET (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+          - variable: saml
+            label: "SAML Authentication Configuration"
+            schema:
+              additional_attrs: true
+              type: dict
+              attrs:
+              - variable: enabled
+                label: "Show SAML Authentication Settings"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: WEBLATE_SAML_IDP_ENTITY_ID
+                      label: "WEBLATE_SAML_IDP_ENTITY_ID (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
+                    - variable: WEBLATE_SAML_IDP_URL
+                      label: "WEBLATE_SAML_IDP_URL (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: WEBLATE_SAML_IDP_X509CERT
+                      label: "WEBLATE_SAML_IDP_X509CERT (Leave empty for default)"
+                      description: "Visit https://docs.weblate.org/en/ on section Environment Variables for more info"
+                      schema:
+                        type: string
+                        private: true
+                        default: ""
       - variable: email
         label: "Email Server Configuration"
         schema:
@@ -1433,7 +1498,7 @@ questions:
           description: The groupID this App of the user running the application"
           schema:
             type: int
-            default: 1000
+            default: 0
         - variable: fsGroup
           label: "fsGroup"
           description: "The group that should own ALL storage."
diff --git a/charts/incubator/weblate/templates/_configmap.tpl b/charts/incubator/weblate/templates/_configmap.tpl
index 6af34fd504f..3aa4a5673ae 100644
--- a/charts/incubator/weblate/templates/_configmap.tpl
+++ b/charts/incubator/weblate/templates/_configmap.tpl
@@ -38,13 +38,17 @@ data:
   WEBLATE_ALLOWED_HOSTS: {{ .Values.weblate.general.WEBLATE_ALLOWED_HOSTS | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_REGISTRATION_OPEN }}
-  WEBLATE_REGISTRATION_OPEN: {{ .Values.weblate.general.WEBLATE_REGISTRATION_OPEN | quote }}
+  WEBLATE_REGISTRATION_OPEN: "true"
+  {{- else }}
+  WEBLATE_REGISTRATION_OPEN: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_REGISTRATION_ALLOW_BACKENDS }}
   WEBLATE_REGISTRATION_ALLOW_BACKENDS: {{ .Values.weblate.general.WEBLATE_REGISTRATION_ALLOW_BACKENDS | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_ENABLE_HTTPS }}
-  WEBLATE_ENABLE_HTTPS: {{ .Values.weblate.general.WEBLATE_ENABLE_HTTPS | quote }}
+  WEBLATE_ENABLE_HTTPS: "true"
+  {{- else }}
+  WEBLATE_ENABLE_HTTPS: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_IP_PROXY_HEADER }}
   WEBLATE_IP_PROXY_HEADER: {{ .Values.weblate.general.WEBLATE_IP_PROXY_HEADER | quote }}
@@ -53,7 +57,9 @@ data:
   WEBLATE_SECURE_PROXY_SSL_HEADER: {{ .Values.weblate.general.WEBLATE_SECURE_PROXY_SSL_HEADER | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_REQUIRE_LOGIN }}
-  WEBLATE_REQUIRE_LOGIN: {{ .Values.weblate.general.WEBLATE_REQUIRE_LOGIN | quote }}
+  WEBLATE_REQUIRE_LOGIN: "true"
+  {{- else }}
+  WEBLATE_REQUIRE_LOGIN: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_LOGIN_REQUIRED_URLS_EXCEPTIONS }}
   WEBLATE_LOGIN_REQUIRED_URLS_EXCEPTIONS: {{ .Values.weblate.general.WEBLATE_LOGIN_REQUIRED_URLS_EXCEPTIONS | quote }}
@@ -86,16 +92,22 @@ data:
   WEBLATE_PAGURE_TOKEN: {{ .Values.weblate.general.WEBLATE_PAGURE_TOKEN | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_SIMPLIFY_LANGUAGES }}
-  WEBLATE_SIMPLIFY_LANGUAGES: {{ .Values.weblate.general.WEBLATE_SIMPLIFY_LANGUAGES | quote }}
+  WEBLATE_SIMPLIFY_LANGUAGES: "true"
+  {{- else }}
+  WEBLATE_SIMPLIFY_LANGUAGES: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_ACCESS_CONTROL }}
   WEBLATE_DEFAULT_ACCESS_CONTROL: {{ .Values.weblate.general.WEBLATE_DEFAULT_ACCESS_CONTROL | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_RESTRICTED_COMPONENT }}
-  WEBLATE_DEFAULT_RESTRICTED_COMPONENT: {{ .Values.weblate.general.WEBLATE_DEFAULT_RESTRICTED_COMPONENT | quote }}
+  WEBLATE_DEFAULT_RESTRICTED_COMPONENT: "true"
+  {{- else }}
+  WEBLATE_DEFAULT_RESTRICTED_COMPONENT: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_TRANSLATION_PROPAGATION }}
-  WEBLATE_DEFAULT_TRANSLATION_PROPAGATION: {{ .Values.weblate.general.WEBLATE_DEFAULT_TRANSLATION_PROPAGATION | quote }}
+  WEBLATE_DEFAULT_TRANSLATION_PROPAGATION: "true"
+  {{- else }}
+  WEBLATE_DEFAULT_TRANSLATION_PROPAGATION: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_COMMITER_EMAIL }}
   WEBLATE_DEFAULT_COMMITER_EMAIL: {{ .Values.weblate.general.WEBLATE_DEFAULT_COMMITER_EMAIL | quote }}
@@ -104,7 +116,9 @@ data:
   WEBLATE_DEFAULT_COMMITER_NAME: {{ .Values.weblate.general.WEBLATE_DEFAULT_COMMITER_NAME | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_SHARED_TM }}
-  WEBLATE_DEFAULT_SHARED_TM: {{ .Values.weblate.general.WEBLATE_DEFAULT_SHARED_TM | quote }}
+  WEBLATE_DEFAULT_SHARED_TM: "true"
+  {{- else }}
+  WEBLATE_DEFAULT_SHARED_TM: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_AKISMET_API_KEY }}
   WEBLATE_AKISMET_API_KEY: {{ .Values.weblate.general.WEBLATE_AKISMET_API_KEY | quote }}
@@ -137,19 +151,27 @@ data:
   WEBLATE_LICENSE_FILTER: {{ .Values.weblate.general.WEBLATE_LICENSE_FILTER | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_LICENSE_REQUIRED }}
-  WEBLATE_LICENSE_REQUIRED: {{ .Values.weblate.general.WEBLATE_LICENSE_REQUIRED | quote }}
+  WEBLATE_LICENSE_REQUIRED: "true"
+  {{- else }}
+  WEBLATE_LICENSE_REQUIRED: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_WEBSITE_REQUIRED }}
-  WEBLATE_WEBSITE_REQUIRED: {{ .Values.weblate.general.WEBLATE_WEBSITE_REQUIRED | quote }}
+  WEBLATE_WEBSITE_REQUIRED: "true"
+  {{- else }}
+  WEBLATE_WEBSITE_REQUIRED: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_HIDE_VERSION }}
-  WEBLATE_HIDE_VERSION: {{ .Values.weblate.general.WEBLATE_HIDE_VERSION | quote }}
+  WEBLATE_HIDE_VERSION: "true"
+  {{- else }}
+  WEBLATE_HIDE_VERSION: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_BASIC_LANGUAGES }}
   WEBLATE_BASIC_LANGUAGES: {{ .Values.weblate.general.WEBLATE_BASIC_LANGUAGES | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEFAULT_AUTO_WATCH }}
-  WEBLATE_DEFAULT_AUTO_WATCH: {{ .Values.weblate.general.WEBLATE_DEFAULT_AUTO_WATCH | quote }}
+  WEBLATE_DEFAULT_AUTO_WATCH: "true"
+  {{- else }}
+  WEBLATE_DEFAULT_AUTO_WATCH: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_RATELIMIT_ATTEMPTS }}
   WEBLATE_RATELIMIT_ATTEMPTS: {{ .Values.weblate.general.WEBLATE_RATELIMIT_ATTEMPTS | quote }}
@@ -161,10 +183,14 @@ data:
   WEBLATE_RATELIMIT_WINDOW: {{ .Values.weblate.general.WEBLATE_RATELIMIT_WINDOW | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_ENABLE_AVATARS }}
-  WEBLATE_ENABLE_AVATARS: {{ .Values.weblate.general.WEBLATE_ENABLE_AVATARS | quote }}
+  WEBLATE_ENABLE_AVATARS: "true"
+  {{- else }}
+  WEBLATE_ENABLE_AVATARS: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH }}
-  WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH: {{ .Values.weblate.general.WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH | quote }}
+  WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH: "true"
+  {{- else }}
+  WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_SSH_EXTRA_ARGS }}
   WEBLATE_SSH_EXTRA_ARGS: {{ .Values.weblate.general.WEBLATE_SSH_EXTRA_ARGS | quote }}
@@ -176,7 +202,9 @@ data:
   WEBLATE_DATABASE_BACKUP: {{ .Values.weblate.general.WEBLATE_DATABASE_BACKUP | quote }}
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_DEBUG }}
-  WEBLATE_DEBUG: {{ .Values.weblate.general.WEBLATE_DEBUG | quote }}
+  WEBLATE_DEBUG: "true"
+  {{- else }}
+  WEBLATE_DEBUG: "false"
   {{- end }}
   {{- if .Values.weblate.general.WEBLATE_LOGLEVEL }}
   WEBLATE_LOGLEVEL: {{ .Values.weblate.general.WEBLATE_LOGLEVEL | quote }}
@@ -234,13 +262,19 @@ data:
   WEBLATE_MT_MODERNMT_KEY: {{ .Values.weblate.machinetranslate.WEBLATE_MT_MODERNMT_KEY | quote }}
   {{- end }}
   {{- if .Values.weblate.machinetranslate.WEBLATE_MT_MYMEMORY_ENABLED }}
-  WEBLATE_MT_MYMEMORY_ENABLED: {{ .Values.weblate.machinetranslate.WEBLATE_MT_MYMEMORY_ENABLED | quote }}
+  WEBLATE_MT_MYMEMORY_ENABLED: "true"
+  {{- else }}
+  WEBLATE_MT_MYMEMORY_ENABLED: "false"
   {{- end }}
   {{- if .Values.weblate.machinetranslate.WEBLATE_MT_GLOSBE_ENABLED }}
-  WEBLATE_MT_GLOSBE_ENABLED: {{ .Values.weblate.machinetranslate.WEBLATE_MT_GLOSBE_ENABLED | quote }}
+  WEBLATE_MT_GLOSBE_ENABLED: "true"
+  {{- else }}
+  WEBLATE_MT_GLOSBE_ENABLED: "false"
   {{- end }}
   {{- if .Values.weblate.machinetranslate.WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED }}
-  WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED: {{ .Values.weblate.machinetranslate.WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED | quote }}
+  WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED: "true"
+  {{- else }}
+  WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED: "false"
   {{- end }}
   {{- if .Values.weblate.machinetranslate.WEBLATE_MT_SAP_BASE_URL }}
   WEBLATE_MT_SAP_BASE_URL: {{ .Values.weblate.machinetranslate.WEBLATE_MT_SAP_BASE_URL | quote }}
@@ -255,7 +289,9 @@ data:
   WEBLATE_MT_SAP_PASSWORD: {{ .Values.weblate.machinetranslate.WEBLATE_MT_SAP_PASSWORD | quote }}
   {{- end }}
   {{- if .Values.weblate.machinetranslate.WEBLATE_MT_SAP_USE_MT }}
-  WEBLATE_MT_SAP_USE_MT: {{ .Values.weblate.machinetranslate.WEBLATE_MT_SAP_USE_MT | quote }}
+  WEBLATE_MT_SAP_USE_MT: "true"
+  {{- else }}
+  WEBLATE_MT_SAP_USE_MT: "false"
   {{- end }}
   {{/* Authentication */}}
   {{/* LDAP */}}
@@ -275,7 +311,9 @@ data:
   WEBLATE_AUTH_LDAP_BIND_PASSWORD: {{ .Values.weblate.auth.ldap.WEBLATE_AUTH_LDAP_BIND_PASSWORD | quote }}
   {{- end }}
   {{- if .Values.weblate.auth.ldap.WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS }}
-  WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS: {{ .Values.weblate.auth.ldap.WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS | quote }}
+  WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS: "true"
+  {{- else }}
+  WEBLATE_AUTH_LDAP_CONNECTION_OPTION_REFERRALS: "false"
   {{- end }}
   {{- if .Values.weblate.auth.ldap.WEBLATE_AUTH_LDAP_USER_SEARCH }}
   WEBLATE_AUTH_LDAP_USER_SEARCH: {{ .Values.weblate.auth.ldap.WEBLATE_AUTH_LDAP_USER_SEARCH | quote }}
@@ -389,13 +427,13 @@ data:
   {{- end }}
   {{/* Linux vendors */}}
   {{- if .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_FEDORA }}
-  WEBLATE_SOCIAL_AUTH_FEDORA: {{ .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_FEDORA | quote }}
+  WEBLATE_SOCIAL_AUTH_FEDORA: "true"
   {{- end }}
   {{- if .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_OPENSUSE }}
-  WEBLATE_SOCIAL_AUTH_OPENSUSE: {{ .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_OPENSUSE | quote }}
+  WEBLATE_SOCIAL_AUTH_OPENSUSE: "true"
   {{- end }}
   {{- if .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_UBUNTU }}
-  WEBLATE_SOCIAL_AUTH_UBUNTU: {{ .Values.weblate.auth.linux.WEBLATE_SOCIAL_AUTH_UBUNTU | quote }}
+  WEBLATE_SOCIAL_AUTH_UBUNTU: "true"
   {{- end }}
   {{/* Slack */}}
   {{- if .Values.weblate.auth.slack.WEBLATE_SOCIAL_AUTH_SLACK_KEY }}
@@ -428,10 +466,14 @@ data:
   WEBLATE_EMAIL_HOST_PASSWORD: {{ .Values.weblate.email.WEBLATE_EMAIL_HOST_PASSWORD | quote }}
   {{- end }}
   {{- if .Values.weblate.email.WEBLATE_EMAIL_USE_SSL }}
-  WEBLATE_EMAIL_USE_SSL: {{ .Values.weblate.email.WEBLATE_EMAIL_USE_SSL | quote }}
+  WEBLATE_EMAIL_USE_SSL: "true"
+  {{- else }}
+  WEBLATE_EMAIL_USE_SSL: "false"
   {{- end }}
   {{- if .Values.weblate.email.WEBLATE_EMAIL_USE_TLS }}
-  WEBLATE_EMAIL_USE_TLS: {{ .Values.weblate.email.WEBLATE_EMAIL_USE_TLS | quote }}
+  WEBLATE_EMAIL_USE_TLS: "true"
+  {{- else }}
+  WEBLATE_EMAIL_USE_TLS: "false"
   {{- end }}
   {{- if .Values.weblate.email.WEBLATE_EMAIL_BACKEND }}
   WEBLATE_EMAIL_BACKEND: {{ .Values.weblate.email.WEBLATE_EMAIL_BACKEND | quote }}
diff --git a/charts/incubator/weblate/values.yaml b/charts/incubator/weblate/values.yaml
index 2edeb93a452..3091d5610b1 100644
--- a/charts/incubator/weblate/values.yaml
+++ b/charts/incubator/weblate/values.yaml
@@ -8,7 +8,7 @@ securityContext:
 
 podSecurityContext:
   runAsUser: 1000
-  runAsGroup: 1000
+  runAsGroup: 0
   fsGroup: 1000
 
 env:
@@ -32,20 +32,20 @@ weblate:
     # WEBLATE_SERVER_EMAIL: ""
     # WEBLATE_DEFAULT_FROM_EMAIL: ""
     # WEBLATE_CONTACT_FORM: ""
-    # WEBLATE_REGISTRATION_OPEN: ""
+    # WEBLATE_REGISTRATION_OPEN: true
     # WEBLATE_REGISTRATION_ALLOW_BACKENDS: ""
-    # WEBLATE_REQUIRE_LOGIN: ""
+    # WEBLATE_REQUIRE_LOGIN: false
     # WEBLATE_LOGIN_REQUIRED_URLS_EXCEPTIONS: ""
     # WEBLATE_ADD_LOGIN_REQUIRED_URLS_EXCEPTIONS: ""
     # WEBLATE_REMOVE_LOGIN_REQUIRED_URLS_EXCEPTIONS: ""
     # WEBLATE_DEFAULT_ACCESS_CONTROL: ""
-    # WEBLATE_DEFAULT_RESTRICTED_COMPONENT: ""
-    # WEBLATE_DEFAULT_TRANSLATION_PROPAGATION: ""
+    # WEBLATE_DEFAULT_RESTRICTED_COMPONENT: false
+    # WEBLATE_DEFAULT_TRANSLATION_PROPAGATION: true
     # WEBLATE_DEFAULT_COMMITER_EMAIL: ""
     # WEBLATE_DEFAULT_COMMITER_NAME: ""
-    # WEBLATE_DEFAULT_SHARED_TM: ""
+    # WEBLATE_DEFAULT_SHARED_TM: true
     # WEBLATE_GPG_IDENTITY: ""
-    # WEBLATE_DEFAULT_AUTO_WATCH: ""
+    # WEBLATE_DEFAULT_AUTO_WATCH: true
     # WEBLATE_GITHUB_USERNAME: ""
     # WEBLATE_GITHUB_TOKEN: ""
     # WEBLATE_GITLAB_USERNAME: ""
@@ -55,25 +55,25 @@ weblate:
     # WEBLATE_CSP_CONNECT_SRC: ""
     # WEBLATE_CSP_STYLE_SRC: ""
     # WEBLATE_CSP_FONT_SRC: ""
-    # WEBLATE_WEBSITE_REQUIRED: ""
-    # WEBLATE_SIMPLIFY_LANGUAGES: ""
+    # WEBLATE_WEBSITE_REQUIRED: true
+    # WEBLATE_SIMPLIFY_LANGUAGES: true
     # WEBLATE_DATABASE_BACKUP: ""
     # WEBLATE_URL_PREFIX: ""
     # WEBLATE_SILENCED_SYSTEM_CHECKS: ""
-    # WEBLATE_HIDE_VERSION: ""
+    # WEBLATE_HIDE_VERSION: false
     # WEBLATE_BASIC_LANGUAGES: ""
-    # WEBLATE_ENABLE_AVATARS: ""
-    # WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH: ""
+    # WEBLATE_ENABLE_AVATARS: true
+    # WEBLATE_LIMIT_TRANSLATION_LENGTH_BY_SOURCE_LENGTH: true
     # WEBLATE_ALLOWED_HOSTS: ""
-    # WEBLATE_ENABLE_HTTPS: ""
+    # WEBLATE_ENABLE_HTTPS: false
     # WEBLATE_IP_PROXY_HEADER: ""
     # WEBLATE_SECURE_PROXY_SSL_HEADER: ""
     # WEBLATE_LICENSE_FILTER: ""
-    # WEBLATE_LICENSE_REQUIRED: ""
+    # WEBLATE_LICENSE_REQUIRED: false
     # WEBLATE_RATELIMIT_ATTEMPTS: ""
     # WEBLATE_RATELIMIT_LOCKOUT: ""
     # WEBLATE_RATELIMIT_WINDOW: ""
-    WEBLATE_DEBUG: "false"
+    # WEBLATE_DEBUG: false
     # WEBLATE_LOGLEVEL: ""
     # WEBLATE_GOOGLE_ANALYTICS_ID: ""
     # WEBLATE_PAGURE_USERNAME: ""
@@ -99,14 +99,14 @@ weblate:
     # WEBLATE_MT_MICROSOFT_REGION: ""
     # WEBLATE_MT_MICROSOFT_BASE_URL: ""
     # WEBLATE_MT_MODERNMT_KEY: ""
-    # WEBLATE_MT_MYMEMORY_ENABLED: ""
-    # WEBLATE_MT_GLOSBE_ENABLED: ""
-    # WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED: ""
+    # WEBLATE_MT_MYMEMORY_ENABLED: false
+    # WEBLATE_MT_GLOSBE_ENABLED: false
+    # WEBLATE_MT_MICROSOFT_TERMINOLOGY_ENABLED: false
     # WEBLATE_MT_SAP_BASE_URL: ""
     # WEBLATE_MT_SAP_SANDBOX_APIKEY: ""
     # WEBLATE_MT_SAP_USERNAME: ""
     # WEBLATE_MT_SAP_PASSWORD: ""
-    # WEBLATE_MT_SAP_USE_MT: ""
+    # WEBLATE_MT_SAP_USE_MT: false
   auth:
     ldap: {}
       # WEBLATE_AUTH_LDAP_SERVER_URI: ""
@@ -173,8 +173,8 @@ weblate:
     # WEBLATE_EMAIL_HOST: ""
     # WEBLATE_EMAIL_HOST_USER: ""
     # WEBLATE_EMAIL_HOST_PASSWORD: ""
-    # WEBLATE_EMAIL_USE_SSL: ""
-    # WEBLATE_EMAIL_USE_TLS: ""
+    # WEBLATE_EMAIL_USE_SSL: false
+    # WEBLATE_EMAIL_USE_TLS: false
     # WEBLATE_EMAIL_BACKEND: ""
   siteintegration: {}
     # WEBLATE_GET_HELP_URL: ""