diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf1667954..bb84dcbd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
## Changelog
#### 1.998-dev (July, 2022)
-
* Fix Apache, BIND, MySQL, ProFTPd and other modules configs on newest distros for new installs
* Fix to use Cron default path when run from UI
* Fix post uninstall cleanups
diff --git a/phpini/config-Ubuntu-Linux-20.0-ALL b/phpini/config-Ubuntu-Linux-20.0-ALL
index 2da748ae9..14c317a0d 100644
--- a/phpini/config-Ubuntu-Linux-20.0-ALL
+++ b/phpini/config-Ubuntu-Linux-20.0-ALL
@@ -1 +1 @@
-php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php
+php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php
diff --git a/postfix/config-AlmaLinux-8.0-ALL b/postfix/config-AlmaLinux-8.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-AlmaLinux-8.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/postfix/config-CentOS-Linux-7.0-ALL b/postfix/config-CentOS-Linux-7.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-CentOS-Linux-7.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/postfix/config-CentOS-Stream-Linux-8.0-ALL b/postfix/config-CentOS-Stream-Linux-8.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-CentOS-Stream-Linux-8.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/postfix/config-Rocky-Linux-8.0-ALL b/postfix/config-Rocky-Linux-8.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-Rocky-Linux-8.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/postfix/config-debian-linux-10.0-ALL b/postfix/config-debian-linux-10.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-debian-linux-10.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/postfix/config-redhat-linux-24.0-ALL b/postfix/config-redhat-linux-24.0-ALL
new file mode 100644
index 000000000..52043502e
--- /dev/null
+++ b/postfix/config-redhat-linux-24.0-ALL
@@ -0,0 +1,33 @@
+postfix_control_command=/usr/sbin/postfix
+postfix_config_command=/usr/sbin/postconf
+postfix_config_file=/etc/postfix/main.cf
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
+postfix_super_command=/usr/sbin/postsuper
+max_records=200
+perpage=20
+mailq_dir=/var/spool/postfix
+mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+sort_mode=0
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+check_config=1
+top_buttons=1
+wrap_width=80
+index_check=1
+postfix_master=/etc/postfix/master.cf
+columns=2
+show_cmts=0
+prefix_cmts=0
+ldap_doms=0
+delete_confirm=1
+max_maps=400
+reload_cmd=systemctl reload postfix
+stop_cmd=systemctl stop postfix
+start_cmd=systemctl start postfix
diff --git a/sshd/config-AlmaLinux-8.0-ALL b/sshd/config-AlmaLinux-8.0-ALL
index 1f065023a..7bc4cd120 100644
--- a/sshd/config-AlmaLinux-8.0-ALL
+++ b/sshd/config-AlmaLinux-8.0-ALL
@@ -9,3 +9,4 @@ sync_create=0
sync_auth=1
sync_pass=0
sync_gnupg=0
+restart_cmd=systemctl reload sshd
diff --git a/sshd/config-CentOS-Stream-Linux-8.0-ALL b/sshd/config-CentOS-Stream-Linux-8.0-ALL
index 1f065023a..7bc4cd120 100644
--- a/sshd/config-CentOS-Stream-Linux-8.0-ALL
+++ b/sshd/config-CentOS-Stream-Linux-8.0-ALL
@@ -9,3 +9,4 @@ sync_create=0
sync_auth=1
sync_pass=0
sync_gnupg=0
+restart_cmd=systemctl reload sshd
diff --git a/sshd/config-Rocky-Linux-8.0-ALL b/sshd/config-Rocky-Linux-8.0-ALL
index 1f065023a..7bc4cd120 100644
--- a/sshd/config-Rocky-Linux-8.0-ALL
+++ b/sshd/config-Rocky-Linux-8.0-ALL
@@ -9,3 +9,4 @@ sync_create=0
sync_auth=1
sync_pass=0
sync_gnupg=0
+restart_cmd=systemctl reload sshd
diff --git a/sshd/config-Ubuntu-Linux-10.10-ALL b/sshd/config-Ubuntu-Linux-10.10-17.10
similarity index 100%
rename from sshd/config-Ubuntu-Linux-10.10-ALL
rename to sshd/config-Ubuntu-Linux-10.10-17.10
diff --git a/sshd/config-Ubuntu-Linux-18.04-ALL b/sshd/config-Ubuntu-Linux-18.04-ALL
new file mode 100644
index 000000000..7bc4cd120
--- /dev/null
+++ b/sshd/config-Ubuntu-Linux-18.04-ALL
@@ -0,0 +1,12 @@
+sshd_path=/usr/sbin/sshd
+sshd_config=/etc/ssh/sshd_config
+client_config=/etc/ssh/ssh_config
+pid_file=/var/run/sshd.pid
+start_cmd=systemctl start sshd
+stop_cmd=systemctl stop sshd
+keygen_path=/usr/bin/ssh-keygen
+sync_create=0
+sync_auth=1
+sync_pass=0
+sync_gnupg=0
+restart_cmd=systemctl reload sshd
diff --git a/sshd/config-debian-linux-10.0-ALL b/sshd/config-debian-linux-10.0-ALL
index 1f065023a..7bc4cd120 100644
--- a/sshd/config-debian-linux-10.0-ALL
+++ b/sshd/config-debian-linux-10.0-ALL
@@ -9,3 +9,4 @@ sync_create=0
sync_auth=1
sync_pass=0
sync_gnupg=0
+restart_cmd=systemctl reload sshd
diff --git a/sshd/config-redhat-linux-24.0-ALL b/sshd/config-redhat-linux-24.0-ALL
index 08ed8896a..7bc4cd120 100644
--- a/sshd/config-redhat-linux-24.0-ALL
+++ b/sshd/config-redhat-linux-24.0-ALL
@@ -2,10 +2,11 @@ sshd_path=/usr/sbin/sshd
sshd_config=/etc/ssh/sshd_config
client_config=/etc/ssh/ssh_config
pid_file=/var/run/sshd.pid
-start_cmd=systemctl start sshd.service
-stop_cmd=systemctl stop sshd.service
+start_cmd=systemctl start sshd
+stop_cmd=systemctl stop sshd
keygen_path=/usr/bin/ssh-keygen
sync_create=0
sync_auth=1
sync_pass=0
sync_gnupg=0
+restart_cmd=systemctl reload sshd