diff --git a/stowers/ssh/dot-ssh/conf.d/common/config.conf b/stowers/ssh/dot-ssh/conf.d/common/config.conf
new file mode 100644
index 0000000..07ff3a5
--- /dev/null
+++ b/stowers/ssh/dot-ssh/conf.d/common/config.conf
@@ -0,0 +1 @@
+AddKeysToAgent yes
diff --git a/stowers/ssh/dot-ssh/config b/stowers/ssh/dot-ssh/conf.d/common/hosts.conf
similarity index 96%
rename from stowers/ssh/dot-ssh/config
rename to stowers/ssh/dot-ssh/conf.d/common/hosts.conf
index 300ea3d..21a670d 100644
--- a/stowers/ssh/dot-ssh/config
+++ b/stowers/ssh/dot-ssh/conf.d/common/hosts.conf
@@ -1,7 +1,3 @@
-#
-AddKeysToAgent yes
-UseKeychain yes
-
 Host localhost
   UserKnownHostsFile /dev/null
   StrictHostKeyChecking no
diff --git a/stowers/ssh/dot-ssh/conf.d/platform/macos.conf b/stowers/ssh/dot-ssh/conf.d/platform/macos.conf
new file mode 100644
index 0000000..e495e94
--- /dev/null
+++ b/stowers/ssh/dot-ssh/conf.d/platform/macos.conf
@@ -0,0 +1 @@
+UseKeychain yes
diff --git a/stowers/ssh/dot-ssh/config.base b/stowers/ssh/dot-ssh/config.base
new file mode 100644
index 0000000..a07b436
--- /dev/null
+++ b/stowers/ssh/dot-ssh/config.base
@@ -0,0 +1,2 @@
+Include conf.d/common/config.conf
+Include conf.d/common/hosts.conf