diff --git a/_ssh_config b/_ssh_config
index 98c70a8..6f7f61e 100644
--- a/_ssh_config
+++ b/_ssh_config
@@ -4,38 +4,6 @@ Host nas
     Port 36899
     ServerAliveInterval 10
 
-Host bluecanvas bluecanvas.com
-    HostName www01.bluecanvas.com
-    User bluecanvas
-
-Host bluecanvas-dev bluecanvas.dev www.bluecanvas.dev
-    HostName bluecanvas.dev
-    User bluecanvas
-
-Host bluecanvas.varnish bluecanvas-varnish
-    HostName 50.56.58.134
-    User bluecanvas
-
-Host bluecanvas.mysql bluecanvas-mysql
-    HostName 50.56.127.145
-    User bluecanvas
-
-Host section sectionstudios sectionstudios.com
-    HostName sectionstudios.com
-    User buddy
-
-Host beerbelly
-    HostName 50.62.232.1
-    User k8662057
-
-Host section-rack
-    HostName 166.78.109.187
-    User buddy
-
-Host bloodbath
-    HostName bloodbathkills.com
-    User u44572522
-
 Host dv2-prod-1
     HostName image-prod-1.convertro.com
     User root
@@ -72,7 +40,7 @@ Host octopus
     HostName octopus.convertro.com
     User buddy
 
-Host bakery bake baked ci
+Host bakery bake baked
     HostName bakery.convertro.com
     User buddy
 
@@ -80,6 +48,14 @@ Host next image-next dv2-next
     HostName image-next.convertro.com
     User root
 
+Host ci image-ci dv2-ci
+    HostName image-ci.convertro.com
+    User root
+
+Host marionette puppet
+    HostName marionette.convertro.com
+    User buddy
+
 Host htpc
     HostName htpc
     User xbmc