diff --git a/home/.chezmoitemplates/secrets/key-windows-11-professional-key b/home/.chezmoitemplates/secrets/WINDOWS_11_PRO_KEY
similarity index 100%
rename from home/.chezmoitemplates/secrets/key-windows-11-professional-key
rename to home/.chezmoitemplates/secrets/WINDOWS_11_PRO_KEY
diff --git a/home/.chezmoitemplates/secrets/key-windows-11-professional-key-alternate b/home/.chezmoitemplates/secrets/WINDOWS_11_PRO_KEY_ALTERNATE
similarity index 100%
rename from home/.chezmoitemplates/secrets/key-windows-11-professional-key-alternate
rename to home/.chezmoitemplates/secrets/WINDOWS_11_PRO_KEY_ALTERNATE
diff --git a/home/.chezmoitemplates/secrets/key-cloudflare-api-key b/home/.chezmoitemplates/secrets/key-cloudflare-api-key
deleted file mode 100644
index 37d1514d..00000000
--- a/home/.chezmoitemplates/secrets/key-cloudflare-api-key
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2NWhTM2FzREkrU3h2amRm
-bHVBQ1QyUUpDbFlUNnVCM1JzZ0grSk9XaERjCmNwWStKdnFkc1dNZFpWeGNEekZw
-Mk03cWg1NjhLbCtVN0VhRkwvYzRQb2MKLS0tIE40UzMyc3ViaFNvdkUzeGcybG9u
-Uk81UlFJYm1USThkVG5xR3dBelVmbk0KE6nyore41zHzaMi0oVYxf2TT1yG+Ih2o
-N2KO3HwA3vj+1f5ezcVCBwspnIhWpLt6mx0sNtxwtSMTFhNLXi2cVMqpIHmS/tDF
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/.chezmoitemplates/secrets/key-cloudflare-email b/home/.chezmoitemplates/secrets/key-cloudflare-email
deleted file mode 100644
index c58476ae..00000000
--- a/home/.chezmoitemplates/secrets/key-cloudflare-email
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFN1RIdFZvd0JDeDVvTTJm
-UC82YkxubXorMi9UU1Z0WUFoUERGL081SUhNCk5aSHFrQjZBK1Y1OFF5Y1RFaUV4
-cWoyOTFIQWJiOUdVV3VQdDFmczJ5emMKLS0tIDF0SEg0allBWjdaMkxtWHJTTXJt
-M1J6NjU5WHgyTVc4MWlURUpKbEM0eUUKQ119oo1+qqqeEYXVXUWJ+NaeNVU7zGD5
-YrBlfRS6YZxWz9pSPyQ9Rax9y0fPz824SzGUeQ==
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/.chezmoitemplates/secrets/key-mullvad-username b/home/.chezmoitemplates/secrets/key-mullvad-username
deleted file mode 100644
index da3bf107..00000000
--- a/home/.chezmoitemplates/secrets/key-mullvad-username
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLdDlhUEFGZGl2R0lHbDE2
-MmU1ajFUMXF5anRjNmh5TmZ5c2JWaFd1djNjCkZXeDRhdlBBQy9hdVUzRTNPVnNk
-bUlSYUplMkFNczRNa1Y4VUEwZmV5QWsKLS0tIE1nTVYrWUFrT1dBbTlqRlo0ZHV6
-emlLZXVwOHkxNkFXN2FUeVRWakhmOVkKEgDStQ2KvQ0pczV4hziUCnB6/DH0FQJb
-9yoRANO9meWX+D4E1F3/frNf8ccjelE2
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/.chezmoitemplates/secrets/key-slack-app-client-id b/home/.chezmoitemplates/secrets/key-slack-app-client-id
deleted file mode 100644
index 309f4960..00000000
--- a/home/.chezmoitemplates/secrets/key-slack-app-client-id
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNWmRGWko1WU1ZNSsrVlR0
-dGQzRnRWSWVhWlRNY1ZiVWw2UmhXVjk4bW5JCmlzc2tXN1djTFU3cVlyc0FCYXZl
-dDNuRklLZEZ2MUU4cE1Vb1RMNWVLTmsKLS0tIG1DM1RVSTF6aGVIUjROdEMzc3V2
-MmNvU0J4dk9QajU2SlUrU2dyMUlrL0EKh8DWuO8GQEIl23Up3hFZTytGcz25IClA
-WhO8aUWytwPUZ4gx/EZ4Knl7wTbG1DHMmb6qzwS8A08LgjI=
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/.chezmoitemplates/secrets/key-slack-app-client-secret b/home/.chezmoitemplates/secrets/key-slack-app-client-secret
deleted file mode 100644
index c88bf0e0..00000000
--- a/home/.chezmoitemplates/secrets/key-slack-app-client-secret
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1ODllRGZuT3pvMTh4aVdn
-VjFhbDZDK203RENBS2MvZnI2MnA4NWFTZzFnCjRqQVdZeXk1SkN0Zzg2NFo5Y1pG
-K09YR1Vpb3NPV0cxZTdPWnZKQ1hvVUUKLS0tIG5LV003MjM0VnpPNGVua3h4UDZh
-QlR3S1RXMnU2V1JqS1dXbjBJRldEOFEKOGa3N7rmEkrojP+HOOa1QHf5PZXvfUUk
-D55NBQMd9Y10m0yMNc2mK28L0iRxCvHKzWv5pYZYUmuTY1Ru3BNiuQ==
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/private_dot_ssh/private_known_hosts.tmpl b/home/private_dot_ssh/private_known_hosts.tmpl
index cdcf3d14..ad090774 100644
--- a/home/private_dot_ssh/private_known_hosts.tmpl
+++ b/home/private_dot_ssh/private_known_hosts.tmpl
@@ -1,9 +1,8 @@
-{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "ssh" "known_hosts")) -}}
-{{-   includeTemplate "ssh/known_hosts" | decrypt -}}
-{{- else -}}
 bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
 bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=
 bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M=
 github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
 gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
-{{- end -}}
\ No newline at end of file
+{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "ssh" "known_hosts")) -}}
+{{-   includeTemplate "ssh/known_hosts" | decrypt -}}
+{{- end -}}