diff --git a/roles/basessh/templates/sshd_config b/roles/basessh/templates/sshd_config
index ca1955db50..7a8707a609 100644
--- a/roles/basessh/templates/sshd_config
+++ b/roles/basessh/templates/sshd_config
@@ -2,11 +2,11 @@ Protocol 2
 
 Port {{ sshd_port }}
 
-{% if ansible_distribution_major_version|int == 6 and ansible_distribution == 'RedHat' %}
+{% if ansible_distribution_major_version|int == 6 %}
 KexAlgorithms diffie-hellman-group-exchange-sha256
 MACs hmac-sha2-512,hmac-sha2-256
 Ciphers aes256-ctr,aes192-ctr,aes128-ctr
-{% elif ansible_distribution_major_version|int == 7 and ansible_distribution == 'RedHat' %}
+{% elif ansible_distribution_major_version|int == 7 %}
 KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
 MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
@@ -52,9 +52,9 @@ AllowAgentForwarding no
 X11Forwarding no
 PermitTunnel no
 
-{% if ansible_distribution_major_version == "6" and ansible_distribution == 'RedHat' %}
+{% if ansible_distribution_major_version|int == 6 %}
 UsePrivilegeSeparation yes
-{% elif ansible_distribution_major_version == "7" and ansible_distribution == 'RedHat' %}
+{% elif ansible_distribution_major_version|int == 7 %}
 UsePrivilegeSeparation sandbox
 {% endif %}