diff --git a/.gitignore b/.gitignore
index 89942849..23f9b085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /rpmbuild/SOURCES/eFa-*.tar.gz
 /rpmbuild/SOURCES/eFa-base-4.0.0.tar.gz
 /rpmbuild/SOURCES/eFa-base-4.0.0/eFaInit.old
+/rpmbuild/SOURCES/eFa-base-4.0.0/eFaInit.tgz
diff --git a/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_maxmind b/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_maxmind
index a162d758..f3846d0e 100644
--- a/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_maxmind
+++ b/rpmbuild/SOURCES/eFa-4.0.4/eFa/lib-eFa-Configure/func_maxmind
@@ -20,7 +20,7 @@ func_maxmind(){
   FLAG=1
   while [ $FLAG != "0" ]
     do
-      if [[ $LICENSE =~ ^([0-9A-Za-z]{12}|[0-9A-Za-z]{16}|[0-9A-Za-z]{40})$ ]]; then
+      if [[ $LICENSE =~ ^([0-9A-Za-z]{12}|[0-9A-Za-z]{16}|[0-9A-Za-z_]{40})$ ]]; then
           sed -i "/^\/\/ define('MAXMIND_LICENSE_KEY'/ c\define('MAXMIND_LICENSE_KEY','');" /var/www/html/mailscanner/conf.php
           sed -i "/^define('MAXMIND_LICENSE_KEY'/ c\define('MAXMIND_LICENSE_KEY', '$LICENSE');" /var/www/html/mailscanner/conf.php
           echo -e "$green[eFa]$clean Maxmind License Key installed"
diff --git a/rpmbuild/SOURCES/eFa-base-4.0.0/eFaInit.tgz b/rpmbuild/SOURCES/eFa-base-4.0.0/eFaInit.tgz
deleted file mode 100644
index 35ca7558..00000000
Binary files a/rpmbuild/SOURCES/eFa-base-4.0.0/eFaInit.tgz and /dev/null differ
diff --git a/rpmbuild/SOURCES/eFa-base-4.0.0/opendkim-config-4.0.0.sh b/rpmbuild/SOURCES/eFa-base-4.0.0/opendkim-config-4.0.0.sh
new file mode 100644
index 00000000..91b0640a
--- /dev/null
+++ b/rpmbuild/SOURCES/eFa-base-4.0.0/opendkim-config-4.0.0.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+#-----------------------------------------------------------------------------#
+# eFa 5.0.0 initial mailwatch-configuration script
+#-----------------------------------------------------------------------------#
+# Copyright (C) 2024 https://efa-project.org
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#-----------------------------------------------------------------------------#
+
+#-----------------------------------------------------------------------------#
+# Source the settings file
+#-----------------------------------------------------------------------------#
+source /usr/src/eFa/eFa-settings.inc
+#-----------------------------------------------------------------------------#
+
+sed -i "/^Socket / c\Socket inet:8891@localhost" /etc/opendkim.conf
+
diff --git a/rpmbuild/SOURCES/eFa-base-4.0.0/postfix-config-4.0.0.sh b/rpmbuild/SOURCES/eFa-base-4.0.0/postfix-config-4.0.0.sh
index d73ec450..f4fd561c 100644
--- a/rpmbuild/SOURCES/eFa-base-4.0.0/postfix-config-4.0.0.sh
+++ b/rpmbuild/SOURCES/eFa-base-4.0.0/postfix-config-4.0.0.sh
@@ -85,8 +85,8 @@ postconf -e "smtpd_recipient_restrictions = permit_sasl_authenticated, permit_my
 postconf -e "unverified_recipient_reject_reason = No user at this address"
 postconf -e "unverified_recipient_reject_code = 550"
 #postconf -e "masquerade_domains = \$mydomain"
-postconf -e "smtpd_milters = inet:localhost:8891, inet:localhost:8893, inet:127.0.0.1:33333"
-postconf -e "non_smtpd_milters = inet:localhost:8891, inet:localhost:8893"
+postconf -e "smtpd_milters = inet:127.0.0.1:33333"
+postconf -e "non_smtpd_milters ="
 # 128 MB limit
 postconf -e "message_size_limit = 133169152"
 postconf -e "mailbox_size_limit = 133169152"
diff --git a/rpmbuild/SPECS/MailWatch.spec b/rpmbuild/SPECS/MailWatch.spec
index ab569772..08343112 100644
--- a/rpmbuild/SPECS/MailWatch.spec
+++ b/rpmbuild/SPECS/MailWatch.spec
@@ -26,7 +26,7 @@
 #-----------------------------------------------------------------------------#
 Summary:       MailWatch Web Front-End for MailScanner
 Name:          MailWatch
-Version:       1.2.21
+Version:       1.2.23
 Epoch:         1
 Release:       1.eFa%{?dist}
 License:       GNU GPL v2
diff --git a/rpmbuild/SPECS/eFa4.spec b/rpmbuild/SPECS/eFa4.spec
index bd3fb6f0..827a08ef 100644
--- a/rpmbuild/SPECS/eFa4.spec
+++ b/rpmbuild/SPECS/eFa4.spec
@@ -26,7 +26,7 @@
 Name:      eFa
 Summary:   eFa Maintenance rpm
 Version:   4.0.4
-Release:   41.eFa%{?dist}
+Release:   42.eFa%{?dist}
 Epoch:     1
 Group:     Applications/System
 URL:       https://efa-project.org
@@ -215,7 +215,7 @@ Requires:  unrar >= 6.1.7-1
     # sqlgrey                                    # eFa     # Greylisting
 Requires:  spamassassin_eFa >= 3.4.6-1
     # spamassassin                               # eFa     # MailScanner
-Requires:  MailScanner >= 5.5.1-4
+Requires:  MailScanner >= 5.5.1-5
     # MailScanner                                # eFa     # MailScanner
 Requires:  clamav-unofficial-sigs >= 7.2.2-1
     # clamav-unofficial-sigs                     # eFa     # clamav
@@ -229,7 +229,7 @@ Requires:  perl-libnet >= 3.11-1
     # perl-libnet                                # eFa     # Spamassassin
 Requires:  perl-Encoding-FixLatin >= 1.04-1
     # perl-Encoding-FixLatin                     # eFa     # MailWatch
-Requires:  MailWatch >= 1:1.2.21-1
+Requires:  MailWatch >= 1:1.2.23-1
     # MailWatch                                  # eFa     # MailWatch Frontend
 Requires:  dcc >= 2.3.167-2
     # dcc                                        # eFa     # Spamassassin, MailScanner
@@ -483,6 +483,7 @@ if [ "$1" = "1" ]; then
         /bin/sh %{_usrsrc}/eFa/razor-config-4.0.0.sh
         /bin/sh %{_usrsrc}/eFa/dcc-config-4.0.0.sh
         /bin/sh %{_usrsrc}/eFa/unbound-config-4.0.0.sh
+        /bin/sh %{_usrsrc}/eFa/opendkim-config-4.0.0.sh
         /bin/sh %{_usrsrc}/eFa/yum-cron-config-4.0.0.sh
         /bin/sh %{_usrsrc}/eFa/service-config-4.0.0.sh
         /bin/sh %{_usrsrc}/eFa/eFa-config-4.0.0.sh
@@ -568,6 +569,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %{_sysconfdir}/logrotate.d/eFa-logrotate
 
 %changelog
+* Sat Apr 06 2024 eFa Project <shawniverson@efa-project.org> - 4.0.4-42
+- Fix opendkim during install, update MailScanner and MailWatch
+
 * Sat Mar 04 2023 eFa Project <shawniverson@efa-project.org> - 4.0.4-40
 - Add IUS Archive repo for centos7 hosts
 
diff --git a/rpmbuild/SPECS/mailscanner.spec b/rpmbuild/SPECS/mailscanner.spec
index f3c51784..66c96325 100644
--- a/rpmbuild/SPECS/mailscanner.spec
+++ b/rpmbuild/SPECS/mailscanner.spec
@@ -1,4 +1,4 @@
-%define releasenum 4
+%define releasenum 5
 %undefine _disable_source_fetch
 
 Name:        MailScanner