diff --git a/SubModules/postfix/CMSHook-conf.sh b/SubModules/postfix/CMSHook-conf.sh
index da61e81..e444b23 100644
--- a/SubModules/postfix/CMSHook-conf.sh
+++ b/SubModules/postfix/CMSHook-conf.sh
@@ -11,7 +11,7 @@ fi
 
 
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-$sitename.sh
-sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEName/'${sitename//_}'/' ~/OpenDKIMInit-$sitename.sh
+sed -i -g -e 's/DOMAINname/'$domain'/g' -e 's/SITEName/'${sitename//_}'/g' ~/OpenDKIMInit-$sitename.sh
 
 cat << EOF > /etc/update-motd.d/51-opendkim-"${sitename//_}"
 #!/bin/sh
diff --git a/SubModules/postfix/conf.sh b/SubModules/postfix/conf.sh
index 91c6d8a..eb1fc77 100644
--- a/SubModules/postfix/conf.sh
+++ b/SubModules/postfix/conf.sh
@@ -40,7 +40,7 @@ adduser postfix opendkim
 rm -rf /etc/opendkim.d
 mkdir -p /etc/opendkim.d/keys
 chown opendkim:opendkim /etc/opendkim.d/keys -R
-curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.d.conf
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim
 cat <<EOF > /etc/opendkim.d/TrustedHosts
 127.0.0.1
 ::1
@@ -55,7 +55,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
     mkdir -p /var/spool/postfix/var/run/opendkim
     sudo chown opendkim:postfix /var/spool/postfix/var/run/opendkim
     sed -i "/^RUNDIR=/c\RUNDIR=/var/spool/postfix/var/run/opendkim" /etc/default/opendkim
-    echo "TrustAnchorFile       /usr/share/dns/root.key" >> /etc/opendkim.d/conf
+    echo "TrustAnchorFile       /usr/share/dns/root.key" >> /etc/opendkim.conf
     bash /lib/opendkim/opendkim.service.generate
     systemctl daemon-reload
 fi
@@ -65,7 +65,7 @@ sudo --user opendkim mkdir /etc/opendkim.d/keys/"$hostname"
 sudo --user opendkim opendkim-genkey -r -D /etc/opendkim.d/keys/"$hostname" -d "$hostname" -s $odksec
 echo ""$odksec"._domainkey."$hostname" "$hostname":"$odksec":/etc/opendkim.d/keys/"$hostname"/"$odksec".private" >> /etc/opendkim.d/KeyTable
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-host.sh
-sed -i -e 's/DOMAINname/'$hostname'/' -e 's/SITEName/'host'/' -e 's/vps/'$odksec'/' ~/OpenDKIMInit-host.sh
+sed -i -e 's/DOMAINname/'$hostname'/g' -e 's/SITEName/'host'/g' -e 's/vps/'$odksec'/g' ~/OpenDKIMInit-host.sh
 unset odksec