diff --git a/charts/penpot/Chart.yaml b/charts/penpot/Chart.yaml
index d16bfaef..273f3c83 100644
--- a/charts/penpot/Chart.yaml
+++ b/charts/penpot/Chart.yaml
@@ -4,7 +4,7 @@ name: penpot
 description: The Open-Source design and prototyping platform
 
 type: application
-version: 1.0.33
+version: 1.0.34
 appVersion: 1.19.2
 
 home: https://penpot.app
diff --git a/charts/penpot/values.emporium.yaml b/charts/penpot/values.emporium.yaml
index afebc58c..a4d330cf 100644
--- a/charts/penpot/values.emporium.yaml
+++ b/charts/penpot/values.emporium.yaml
@@ -3,36 +3,6 @@
 ## @type string
 ## @description Generate with `openssl rand -hex 16` for example
 
-## @userSupplied SMTPDefaultFrom
-## @label SMTP Default From
-## @type string
-## @description The SMTP default email to send from
-
-## @userSupplied SMTPDefaultReplyTo
-## @label SMTP Default Reply To
-## @type string
-## @description The SMTP default email to reply to
-
-## @userSupplied SMTPHost
-## @label SMTP Host
-## @type string
-## @description The SMTP host to use
-
-## @userSupplied SMTPPort
-## @label SMTP Port
-## @type integer
-## @description The SMTP host port to use
-
-## @userSupplied SMTPUsername
-## @label SMTP Username
-## @type string
-## @description The SMTP username to use
-
-## @userSupplied SMTPPassword
-## @label SMTP Password
-## @type string
-## @description The SMTP password to use
-
 ## @userSupplied PostgresPassword
 ## @label Postgres Password
 ## @type string
@@ -52,19 +22,19 @@ frontend:
       kubernetes.io/tls-acme: "true"
 
     hosts:
-      - host: {{ .Emporium.Subdomain }}.{{ .Emporium.DNSZone }}
+      - host: {{ .Emporium.Integrations.DNS.Hostname }}
 
     tls:
       - secretName: {{ .Emporium.Name }}-tls
         hosts:
-          - {{ .Emporium.Subdomain }}.{{ .Emporium.DNSZone }}
+          - {{ .Emporium.Integrations.DNS.Hostname }}
 
 persistence:
   enabled: true
   size: 50Gi
 
 config:
-  publicURI: "https://{{ .Emporium.Subdomain }}.{{ .Emporium.DNSZone }}"
+  publicURI: "https://{{ .Emporium.Integrations.DNS.Hostname}}"
   flags: "enable-registration enable-login enable-smtp disable-demo-users disable-demo-warning"
   apiSecretKey: "{{ .Emporium.UserSupplied.APISecretKey }}"
 
@@ -84,10 +54,10 @@ config:
 
   smtp:
     enabled: true
-    defaultFrom: "{{ .Emporium.UserSupplied.SMTPDefaultFrom }}"
-    defaultReplyTo: "{{ .Emporium.UserSupplied.SMTPDefaultReplyTo }}"
-    host: "{{ .Emporium.UserSupplied.SMTPHost }}"
-    port: "{{ .Emporium.UserSupplied.SMTPPort }}"
+    defaultFrom: "{{ .Emporium.Integrations.SMTP.From }}"
+    defaultReplyTo: "{{ .Emporium.Integrations.SMTP.ReplyTo }}"
+    host: "{{ .Emporium.Integrations.SMTP.Host }}"
+    port: "{{ .Emporium.Integrations.SMTP.Port }}"
     tls: true
     existingSecret: "penpot-secret"
     secretKeys:
@@ -97,9 +67,9 @@ config:
   providers:
     oidc:
       enabled: true
-      baseURI: "{{ .Emporium.OpenIDConnect.Issuer }}"
-      clientID: "{{ .Emporium.OpenIDConnect.ClientID }}"
-      clientSecret: "{{ .Emporium.OpenIDConnect.ClientSecret }}"
+      baseURI: "{{ .Emporium.Integrations.OIDC.Issuer }}"
+      clientID: "{{ .Emporium.Integrations.OIDC.ClientID }}"
+      clientSecret: "{{ .Emporium.Integrations.OIDC.ClientSecret }}"
       # authURI: ""
       # tokenURI: ""
       # userURI: ""
@@ -110,8 +80,8 @@ config:
       # emailAttribute: ""
 
 smtp:
-  username: "{{ .Emporium.UserSupplied.SMTPUsername }}"
-  password: "{{ .Emporium.UserSupplied.SMTPPassword }}"
+  username: "{{ .Emporium.Integrations.SMTP.Username }}"
+  password: "{{ .Emporium.Integrations.SMTP.Password }}"
 
 postgresql:
   auth: