diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml
index efbefa1d57c..b9b1a6d221b 100644
--- a/charts/incubator/synapse/Chart.yaml
+++ b/charts/incubator/synapse/Chart.yaml
@@ -24,7 +24,7 @@ maintainers:
 name: synapse
 sources: []
 type: application
-version: 0.0.4
+version: 0.0.5
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/synapse/questions.yaml b/charts/incubator/synapse/questions.yaml
index 5eb2fb0cb67..5d2700c80d2 100644
--- a/charts/incubator/synapse/questions.yaml
+++ b/charts/incubator/synapse/questions.yaml
@@ -83,68 +83,20 @@ questions:
       attrs:
 # Include{fixedEnv}
 # Include{containerConfig}
-  - variable: coturn
+
+  - variable: synapse
     group: "Container Configuration"
-    label: "Coturn Configuration"
+    label: "Synapse Configuration"
     schema:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: enabled
-          label: "Enable Coturn"
+        - variable: loadCustomConfig
+          label: "Load Custom Config"
+          description: "Load custom config located in /data/custom.yaml"
           schema:
             type: boolean
             default: false
-  - variable: mail
-    group: "Container Configuration"
-    label: "Mail Configuration"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: enabled
-          label: "Enable Mail"
-          schema:
-            type: boolean
-            default: false
-            show_subquestions_if: true
-            subquestions:
-              - variable: from
-                label: "From: "
-                schema:
-                  type: string
-                  default: "Matrix <matrix@example.com>"
-              - variable: riotUrl
-                label: "Riot URL"
-                schema:
-                  type: string
-                  default: ""
-              - variable: host
-                label: "Host"
-                schema:
-                  type: string
-                  default: ""
-              - variable: port
-                label: "Port"
-                schema:
-                  type: int
-                  default: 25
-              - variable: username
-                label: "Username"
-                schema:
-                  type: string
-                  default: ""
-              - variable: password
-                label: "Password"
-                schema:
-                  type: string
-                  default: ""
-                  private: true
-              - variable: requireTransportSecurity
-                label: "Require Transport Security"
-                schema:
-                  type: boolean
-                  default: true
 
   - variable: matrix
     group: "Container Configuration"
@@ -346,6 +298,70 @@ questions:
                   type: string
                   default: "WARNING"
 
+  - variable: mail
+    group: "Container Configuration"
+    label: "Mail Configuration"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: enabled
+          label: "Enable Mail"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: from
+                label: "From: "
+                schema:
+                  type: string
+                  default: "Matrix <matrix@example.com>"
+              - variable: riotUrl
+                label: "Riot URL"
+                schema:
+                  type: string
+                  default: ""
+              - variable: host
+                label: "Host"
+                schema:
+                  type: string
+                  default: ""
+              - variable: port
+                label: "Port"
+                schema:
+                  type: int
+                  default: 25
+              - variable: username
+                label: "Username"
+                schema:
+                  type: string
+                  default: ""
+              - variable: password
+                label: "Password"
+                schema:
+                  type: string
+                  default: ""
+                  private: true
+              - variable: requireTransportSecurity
+                label: "Require Transport Security"
+                schema:
+                  type: boolean
+                  default: true
+
+  - variable: coturn
+    group: "Container Configuration"
+    label: "Coturn Configuration"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: enabled
+          label: "Enable Coturn"
+          schema:
+            type: boolean
+            default: false
+
   - variable: service
     group: "Networking and Services"
     label: "Configure Service(s)"
diff --git a/charts/incubator/synapse/templates/_secret.tpl b/charts/incubator/synapse/templates/_secret.tpl
index f83ef68469c..5fb45b6f9e6 100644
--- a/charts/incubator/synapse/templates/_secret.tpl
+++ b/charts/incubator/synapse/templates/_secret.tpl
@@ -41,11 +41,11 @@ stringData:
     {{- end }}
 
     {{- if $previous }}
-    {{- $msk = ( index $previous.data "macaroon_secret_key" ) | b64dec  }}
+    {{- $msk = ( index $previous.data "macaroon_secret_key" )  }}
     macaroon_secret_key: {{ ( index $previous.data "macaroon_secret_key" ) }}
     {{- else }}
     {{- $msk = randAlphaNum 50 }}
-    macaroon_secret_key: {{ $msk | b64enc | quote }}
+    macaroon_secret_key: {{ $msk | quote }}
     {{- end }}
 
     {{- if .Values.coturn.enabled -}}