diff --git a/Chart/.disabled-templates/resourcequota.yaml b/Chart/.disabled-templates/resourcequota.yaml
deleted file mode 100644
index 29c66aa..0000000
--- a/Chart/.disabled-templates/resourcequota.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v1
-kind: ResourceQuota
-metadata:
-  name: {{ include "..fullname" . }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-spec:
-  hard:
-    {{- if and .Values.customer .Values.customer.package }}
-      {{- if .Values.customer.package.cpu }}
-    requests.cpu: {{ .Values.customer.package.cpu.avg | default "1000m" }}
-    limits.cpu: {{ .Values.customer.package.cpu.peak | default "1500m"}}
-      {{- else }}
-    requests.cpu: 1000m
-    limits.cpu: 1500m
-      {{- end }}
-      {{- if .Values.customer.package.mem }}
-    requests.memory: {{ .Values.customer.package.mem.avg | default "512Mi" }}
-    limits.memory: {{ .Values.customer.package.mem.peak | default "1Gi" }}
-      {{- else }}
-    requests.memory: 512Mi
-    limits.memory: 1Gi
-      {{- end }}
-    {{- end }}
\ No newline at end of file
diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml
index 2091eb3..4f7d314 100644
--- a/Chart/Chart.yaml
+++ b/Chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cloudypress
 description: A helm chart for deploying Wordpress on Cloudyne Hosting
 type: application
-version: "0.5.5"
+version: "0.7.0"
 appVersion: "6.1.1"
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index b2a6969..97f0a80 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -7,8 +7,26 @@ metadata:
 data:
     SMTP_PORT: '2525'
     SMTP_AUTH: 'true'
+    {{- if .Values.email }}
+        {{- if .Values.email.forceFromEmail }}
+    SMTP_FORCE_FROM: {{ .Values.email.forceFromEmail }}
+        {{- end }}
+        {{- if .Values.email.forceFromName }}
+    SMTP_FORCE_FROM_NAME: {{ .Values.email.forceFromName }}
+        {{- end }}
+        {{- if .Values.email.allowedDomains }}
+        # join list of allowd domains with comma
+    SMTP_ALLOWED_DOMAINS: {{ .Values.email.allowedDomains | join "," }}
+        {{- end }}
+        {{- if .Values.email.allowedEmails }}
+        # join list of allowd emails with comma
+    SMTP_ALLOWED_EMAILS: {{ .Values.email.allowedEmails | join "," }}
+        {{- end }}
+    {{- else }}
     SMTP_FORCE_FROM: "noreply@customer.v3.nu"
     SMTP_FROM_NAME: "V3 Customer Mailer"
+    {{- end }}
+    
     WP_ENV: "production"
     {{- if .Values.site.overrideMainUrl }}
     WP_HOME: "https://{{ .Values.site.overrideMainUrl }}"
diff --git a/Chart/values.yaml b/Chart/values.yaml
index 8e4c091..010a6f2 100644
--- a/Chart/values.yaml
+++ b/Chart/values.yaml
@@ -22,6 +22,19 @@ customer:
   #     peak: 1Gi
   #   disk: 5Gi
 
+# Settings for email sent from site
+# default is sending from customer@mail
+email: {}
+
+# email:
+#   forceFromEmail: "user@domain.com"
+#   forceFromName: "Some Customer"
+#   allowedDomains:
+#     - "customerdomainA.se"
+#     - "customerdomainB.se"
+#   allowedEmails:
+#     - "noreply@customerdomainC.com"
+
 # Website Configuration
 site:
   # The main URL for the website