diff --git a/fedora-common.ks b/fedora-common.ks
index 5206dce..7dee6ed 100644
--- a/fedora-common.ks
+++ b/fedora-common.ks
@@ -38,7 +38,7 @@ sshca-cli-systemd
 systemd-networkd
 %end
 
-services --enabled systemd-networkd,systemd-resolved,ssh-host-certs-renew.timer,ssh-host-certs.target --disabled systemd-homed,systemd-nsresourced,systemd-nsresourced.socket,systemd-userdbd,systemd-userdbd.socket
+services --enabled systemd-networkd,systemd-resolved --disabled systemd-homed,systemd-nsresourced,systemd-nsresourced.socket,systemd-userdbd,systemd-userdbd.socket
 
 %addon com_redhat_kdump --disable
 %end
@@ -62,14 +62,6 @@ cat >> /etc/ssh/sshd_config.d/70-trustedusercakeys.conf <<'EOF'
 TrustedUserCAKeys /etc/ssh/ca.pub
 EOF
 
-# Configure SSH daemon to use host certificates obtained from SSHCA
-cat > /etc/sysconfig/ssh-host-cert-sign <<EOF
-SSHCA_SERVER=https://sshca.pyrocufflink.blue
-EOF
-for a in ecdsa ed25519 rsa; do
-    printf 'HostCertificate /etc/ssh/ssh_host_%s_key-cert.pub\n' "${a}"
-done > /etc/ssh/sshd_config.d/10-hostcertificate.conf
-
 # Configure networking with systemd-networkd
 # Use MAC address as client ID to keep the same lease from Anaconda
 rm -rf /etc/sysconfig/network-scripts /etc/sysconfig/network