diff --git a/.ssh/config.d/20_schoolinks b/.ssh/config.d/20_schoolinks
index 1b21ef0788cd36a5a1a9a6a888b4a044cb80384c..1ad1b97ff25e10017471b612c108c11550042c4f 100644
--- a/.ssh/config.d/20_schoolinks
+++ b/.ssh/config.d/20_schoolinks
@@ -3,16 +3,13 @@
 # SchooLinks infrastructure
 
 Host ci.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_ci_rsa
-
-Host monitoring.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_apm_rsa
+    IdentityFile ~/Repositories/SchooLinks/sl-devops/secrets/ci
 
 Host sftp*.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_sftp_rsa
+    IdentityFile ~/Repositories/SchooLinks/sl-devops/secrets/sftp
 
 Host firezone*.schoolinks.com
-    IdentityFile ~/.ssh/schoolinks_vpn_rsa
+    IdentityFile ~/Repositories/SchooLinks/sl-devops/secrets/vpn
 
 Host !firezone.schoolinks.com *.schoolinks.com 172.31.*.* 172.30.*.* 172.29.*.*
     ProxyCommand ssh firezone.schoolinks.com -W %h:%p
diff --git a/Makefile b/Makefile
index d676cb88c1f6fc2338c182d0ad0de4fe79495adb..78f78a46a18ae3db2dd9fb576d557bfdecbb97b5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,17 +20,13 @@ ssh-keys: .ssh/github_ed25519
 ssh-keys: .ssh/shore_ecdsa
 ssh-keys: .ssh/shore_ed25519
 ssh-keys: .ssh/shore_rsa
-ssh-keys: .ssh/schoolinks_apm_rsa
-ssh-keys: .ssh/schoolinks_ci_rsa
 ssh-keys: .ssh/schoolinks_dev_rsa
 ssh-keys: .ssh/schoolinks_ed25519
 ssh-keys: .ssh/schoolinks_prod_rsa
 ssh-keys: .ssh/schoolinks_rsa
-ssh-keys: .ssh/schoolinks_sftp_rsa
 ssh-keys: .ssh/schoolinks_stable_rsa
 ssh-keys: .ssh/schoolinks_staging_rsa
 ssh-keys: .ssh/schoolinks_qa_rsa
-ssh-keys: .ssh/schoolinks_vpn_rsa
 
 .ssh/%_rsa: Documents/Database.kdbx
 	$(mkd)