diff --git a/pmg/pmg_baseline.sls b/pmg/pmg_baseline.sls
index eecfe6d..50ddcf7 100644
--- a/pmg/pmg_baseline.sls
+++ b/pmg/pmg_baseline.sls
@@ -17,6 +17,21 @@ pmg-cluster-status:
   cmd.run:
     - name: pmgcm status
 
+pmg-postfix-identity-from-system-hostname:
+  cmd.run:
+    - name: >-
+        HN="$(hostname -f)" &&
+        DM="${HN#*.}" &&
+        postconf -e "myhostname=${HN}" "mydomain=${DM}" &&
+        systemctl reload postfix
+    - unless: >-
+        HN="$(hostname -f)" &&
+        DM="${HN#*.}" &&
+        [ "$(postconf -h myhostname)" = "${HN}" ] &&
+        [ "$(postconf -h mydomain)" = "${DM}" ]
+    - require:
+      - service: pmg-service-postfix
+
 {% if manage_hosts_file %}
 pmg-managed-hosts:
   file.blockreplace: