diff --git a/roles/common/templates/sshd_config_Debian-8.j2 b/roles/common/templates/sshd_config_Debian-8.j2
index 0a1e33a..18b2b74 100644
--- a/roles/common/templates/sshd_config_Debian-8.j2
+++ b/roles/common/templates/sshd_config_Debian-8.j2
@@ -89,7 +89,7 @@ UsePAM yes
 # ... but with ciphers and MACs with < 256 bits removed, as NSA's Suite B now
 # does away with these! See: https://www.nsa.gov/ia/programs/suiteb_cryptography/index.shtml
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr
-MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
+MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512,hmac-sha2-256
 KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 
 # only allow shell access by provisioning user
diff --git a/roles/common/templates/sshd_config_Ubuntu-14.04.j2 b/roles/common/templates/sshd_config_Ubuntu-14.04.j2
index 6b35fd1..ac8620f 100644
--- a/roles/common/templates/sshd_config_Ubuntu-14.04.j2
+++ b/roles/common/templates/sshd_config_Ubuntu-14.04.j2
@@ -89,7 +89,7 @@ UsePAM yes
 # ... but with ciphers and MACs with < 256 bits removed, as NSA's Suite B now
 # does away with these! See: https://www.nsa.gov/ia/programs/suiteb_cryptography/index.shtml
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr
-MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
+MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512,hmac-sha2-256
 KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 
 # only allow shell access by provisioning user
diff --git a/roles/common/templates/sshd_config_Ubuntu-16.04.j2 b/roles/common/templates/sshd_config_Ubuntu-16.04.j2
index 6081e4f..a58f814 100644
--- a/roles/common/templates/sshd_config_Ubuntu-16.04.j2
+++ b/roles/common/templates/sshd_config_Ubuntu-16.04.j2
@@ -87,7 +87,7 @@ UsePAM yes
 
 # https://stribika.github.io/2015/01/04/secure-secure-shell.html
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr
-MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-ripemd160-etm@openssh.com,umac-128-etm@openssh.com
+MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-ripemd160-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256
 KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 
 {% if ssh_allowed_users is defined and ssh_allowed_users %}