diff --git a/tasks/.main.yml.swp b/tasks/.main.yml.swp
deleted file mode 100644
index c1a94a0..0000000
Binary files a/tasks/.main.yml.swp and /dev/null differ
diff --git a/tasks/main.yml b/tasks/main.yml
index 8928254..925e002 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,7 @@
 - name: deploy
   kubernetes.core.helm:
     name: mailman3
-    chart_ref: https://github.com/fw8/mailman3-helm-chart.git
+    chart_ref: https://gitea.eom.dev/DevOps/helm-mailman3/releases/download/v1.0.8/helm-mailman3-v1.0.8.tar.gz
     release_namespace: mailman3
     create_namespace: true
     values:
@@ -15,8 +15,8 @@
       # These are the settings that you MUST change before deploying:
       # Initial Settings for the admin account:
       admin:
-        username: admin
-        email: mailman@eom.dev
+        username: mailman_admin
+        email: mailman_admin@eom.dev
         password: "{{ mailman_admin_password }}"
       # some keys have to be provided...
       hyperkittyApiKey: "{{ mailman_hyperkitty_api_key }}"
@@ -28,55 +28,51 @@
       core:
         image:
           repository: maxking/mailman-core
-        podAnnotations: {}
-        podSecurityContext: {}
-        # fsGroup: 2000
-        securityContext: {}
-        # capabilities:
-        #   drop:
-        #   - ALL
-        # readOnlyRootFilesystem: true
-        # runAsNonRoot: true
-        # runAsUser: 1000
-        nodeSelector: {}
-        tolerations: []
-        affinity: {}
-        resources:
-        # We usually recommend not to specify default resources and to leave this as a conscious
-        # choice for the user. This also increases chances charts run on environments with little
-        # resources, such as Minikube. If you do want to specify resources, uncomment the following
-        # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-          limits:
-            cpu: 100m
-            memory: 512Mi
-          requests:
-            cpu: 100m
-            memory: 128Mi
         persistence:
-          # persistence.existingClaim: ...
-          size: 100Gi
-          accessMode: ReadWriteOnce
+          size: 2Ti
+        resources:
+          limits:
+            memory: 2Gi
+          requests:
+            memory: 512Mi
+      smtp:
+        host: postfix.eom.dev
+        host_user: mailman_admin@eom.dev
+        host_password: "{{ mailman_admin_password }}"
+        use_tls: "true"
+        port: "587"
       web:
         image:
           repository: maxking/mailman-web
-        podAnnotations: {}
-        podSecurityContext: {}
-        securityContext: {}
-        nodeSelector: {}
-        tolerations: []
-        affinity: {}
-        resources: {}
         persistence:
-          # persistence.existingClaim: ...
-          size: 100Gi
-          accessMode: ReadWriteOnce
-      service:
-        type: ClusterIP
+          size: 2Ti
       ingress:
-        enabled: false
-        tls: false
+        enabled: true
+        className: nginx
         annotations:
-          # use NGINX Ingress Controller
-          kubernetes.io/ingress.class: "nginx"
-          # use Cert-Manager for LetsEncrypt Certificates
-          cert-manager.io/issuer: "ca-cert"
+          cert-manager.io/cluster-issuer: ca-issuer
+          nginx.ingress.kubernetes.io/enable-cors: "true"
+          nginx.ingress.kubernetes.io/cors-allow-headers: "X-Forwarded-For"
+        hosts:
+          - host: mailman.eom.dev
+            paths:
+              - path: /
+                pathType: Prefix
+        tls:
+          - hosts:
+            - mailman.eom.dev
+            secretName: mailman3-tls
+      postgresql:
+        enabled: true
+        image:
+          pullPolicy: Always
+        global:
+          postgresql:
+            auth:
+              username: mailman
+              password: "{{ mailman_admin_password }}"
+              database: mailman
+        primary:
+          persistence:
+            enabled: true
+            size: 2Ti