diff --git a/containers/doc/server-kubernetes/migration-job.yaml b/containers/doc/server-kubernetes/migration-job.yaml
index f695ef8079cc..24c0c092b906 100644
--- a/containers/doc/server-kubernetes/migration-job.yaml
+++ b/containers/doc/server-kubernetes/migration-job.yaml
@@ -39,6 +39,7 @@ spec:
                           /etc/salt \
                           /etc/tomcat \
                           /etc/cobbler \
+                          /etc/postfix \
                           /etc/sysconfig;
             do
               rsync -avz uyuni.world-co.com:$folder/ $folder;
@@ -91,6 +92,8 @@ spec:
             name: etc-cobbler
           - mountPath: /etc/sysconfig
             name: etc-sysconfig
+          - mountPath: /etc/postfix
+            name: etc-postfix
           - mountPath: /root/keys
             name: ssh-key
       volumes:
@@ -157,6 +160,9 @@ spec:
         - name: etc-sysconfig
           persistentVolumeClaim:
             claimName: etc-sysconfig
+        - name: etc-postfix
+          persistentVolumeClaim:
+            claimName: etc-postfix
         - name: ssh-key
           secret:
             secretName: migration-ssh-key
diff --git a/containers/doc/server-kubernetes/pvs.yaml b/containers/doc/server-kubernetes/pvs.yaml
index e75a64c99c42..a71e69596897 100644
--- a/containers/doc/server-kubernetes/pvs.yaml
+++ b/containers/doc/server-kubernetes/pvs.yaml
@@ -529,3 +529,28 @@ spec:
             operator: In
             values:
               - uyuni-dev
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: etc-postfix
+  labels:
+    data: etc-postfix
+spec:
+  capacity:
+    storage: 1Mi
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  storageClassName: local-storage
+  local:
+    path: /var/uyuni/etc-postfix
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+        - matchExpressions:
+          - key: kubernetes.io/hostname
+            operator: In
+            values:
+              - uyuni-dev
+
diff --git a/containers/server-helm/templates/deployment.yaml b/containers/server-helm/templates/deployment.yaml
index 67e8a4bbd838..524a934ac099 100644
--- a/containers/server-helm/templates/deployment.yaml
+++ b/containers/server-helm/templates/deployment.yaml
@@ -367,6 +367,22 @@ spec:
         volumeMounts:
           - mountPath: /mnt
             name: etc-sysconfig
+      - name: init-etc-postfix
+        image: {{- include "deployment.container.image" (dict "name" "server" "global" .) | indent 1}}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command:
+          - sh
+          - -x
+          - -c
+          - >
+            chown --reference=/etc/postfix /mnt;
+            chmod --reference=/etc/postfix /mnt;
+            if [ -z "$(ls -A /mnt)" ]; then
+              cp -a /etc/postfix/. /mnt;
+            fi
+        volumeMounts:
+          - mountPath: /mnt
+            name: etc-postfix
       containers:
       - name: uyuni
         image: {{- include "deployment.container.image" (dict "name" "server" "global" .) | indent 1}}
@@ -447,6 +463,8 @@ spec:
             name: etc-sysconfig
           - mountPath: /etc/pki/tls
             name: etc-tls
+          - mountPath: /etc/postfix
+            name: etc-postfix
           - name: ca-cert
             mountPath: /etc/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT
             readOnly: true
@@ -532,6 +550,9 @@ spec:
       - name: etc-sysconfig
         persistentVolumeClaim:
           claimName: etc-sysconfig
+      - name: etc-postfix
+        persistentVolumeClaim:
+          claimName: etc-postfix
       - name: ca-cert
         configMap:
           name: uyuni-ca
diff --git a/containers/server-helm/templates/volumes.yaml b/containers/server-helm/templates/volumes.yaml
index c909be28363e..8ad678d3842b 100644
--- a/containers/server-helm/templates/volumes.yaml
+++ b/containers/server-helm/templates/volumes.yaml
@@ -549,3 +549,27 @@ spec:
     matchLabels:
       data: etc-tls
 {{- end }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: etc-postfix
+  namespace: "{{ .Release.Namespace }}"
+spec:
+{{- if .Values.storageClass }}
+{{- if (eq "-" .Values.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.storageClass }}"
+{{- end }}
+{{- end }}
+  accessModes:
+{{ toYaml .Values.accessModes | indent 4 }}
+  resources:
+    requests:
+      storage: 1Mi
+{{- if .Values.matchPvByLabel }}
+  selector:
+    matchLabels:
+      data: etc-postfix
+{{- end }}
diff --git a/susemanager/susemanager.changes.mbussolotto.postfix b/susemanager/susemanager.changes.mbussolotto.postfix
deleted file mode 100644
index 76abe2b83535..000000000000
--- a/susemanager/susemanager.changes.mbussolotto.postfix
+++ /dev/null
@@ -1 +0,0 @@
-- setup postfix hostname using conf file