diff --git a/ansible/api-core.yml b/ansible/api-core.yml
index 3643aac1..f9d8444b 100644
--- a/ansible/api-core.yml
+++ b/ansible/api-core.yml
@@ -1,7 +1,7 @@
 ---
 - hosts: mongodb
+- hosts: clio
 - hosts: navi
-- hosts: charon
 - hosts: rabbitmq
 - hosts: redis
 - hosts: big-poppa
diff --git a/ansible/delta-hosts/hosts b/ansible/delta-hosts/hosts
index 7accfb69..c18acb2a 100644
--- a/ansible/delta-hosts/hosts
+++ b/ansible/delta-hosts/hosts
@@ -53,17 +53,17 @@ delta-api-socket
 delta-api-socket-proxy
 
 [deployer]
-delta-app-services
+delta-app-services-1
 
 [docks]
 
 [dock]
 
 [agreeable-egret]
-delta-app-services
+delta-app-services-1
 
 [eru]
-delta-app-services
+delta-app-services-1
 
 [navi]
 delta-navi
@@ -72,14 +72,11 @@ delta-navi
 delta-navi
 
 [clio]
-delta-app-services
+delta-app-services-1
 
 [link]
 delta-navi
 
-[charon]
-delta-app-services
-
 [khronos]
 delta-dock-services
 
@@ -87,7 +84,7 @@ delta-dock-services
 delta-dock-services
 
 [detention]
-delta-app-services
+delta-app-services-1
 
 [palantiri]
 delta-dock-services
@@ -96,10 +93,10 @@ delta-dock-services
 delta-rabbit
 
 [web]
-delta-app-services
+delta-app-services-1
 
 [marketing]
-delta-app-services
+delta-app-services-1
 
 [metabase]
 delta-metabase
@@ -111,7 +108,7 @@ delta-redis
 delta-redis-slave
 
 [shiva]
-delta-app-services
+delta-app-services-2
 
 [registry]
 delta-registry
@@ -122,26 +119,23 @@ delta-dock-services
 [swarm-manager]
 delta-swarm-manager
 
-[metis]
-delta-app-services
-
 [drake]
-delta-app-services
+delta-app-services-2
 
 [pheidi]
-delta-app-services
+delta-app-services-1
 
 [github-varnish]
-delta-app-services
+delta-app-services-1
 
 [big-poppa]
-delta-app-services
+delta-app-services-2
 
 [cream]
-delta-app-services
+delta-app-services-2
 
 [arithmancy]
-delta-app-services
+delta-app-services-1
 
 [prometheus]
 delta-prometheus
@@ -152,7 +146,6 @@ api
 arithmancy
 bastion
 big-poppa
-charon
 consul
 cream
 dock
@@ -165,7 +158,6 @@ hipache
 ingress
 khronos
 metabase
-metis
 mongodb
 navi
 optimus
diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
index a80f4c65..b5381e91 100644
--- a/ansible/delta-hosts/variables
+++ b/ansible/delta-hosts/variables
@@ -101,9 +101,6 @@ metabase_pg_pass=nifty-prowl-sought-muscles
 metabase_pg_port=5432
 metabase_pg_user=metabase
 
-[metis:vars]
-metis_rollbar_key=fdc8565a7ce64c6d9432c34be425937c
-
 [navi:vars]
 navi_new_relic_app_name=delta-navi
 navi_cookie_secret=e80173940e7bdd84734e868b6ea054a0
diff --git a/ansible/pheidi.yml b/ansible/pheidi.yml
index 3eaa4ff5..39793cc6 100644
--- a/ansible/pheidi.yml
+++ b/ansible/pheidi.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: consul
 - hosts: mongodb
+- hosts: big-poppa
 - hosts: rabbitmq
 
 - hosts: pheidi
@@ -11,5 +12,4 @@
     rollbar_token: "{{ pheidi_rollbar_token }}"
     tags: [ notify ]
   - { role: builder, tags: [build] }
-  - { role: tls-client, tls_service: mongodb, tags: [ tls ] }
   - { role: container_kill_start }
diff --git a/ansible/socket-server.yml b/ansible/socket-server.yml
index 067ef6b8..37cd675b 100644
--- a/ansible/socket-server.yml
+++ b/ansible/socket-server.yml
@@ -1,7 +1,6 @@
 ---
 - hosts: mongodb
 - hosts: navi
-- hosts: charon
 - hosts: rabbitmq
 - hosts: redis
 - hosts: swarm-manager
diff --git a/ansible/workers.yml b/ansible/workers.yml
index 1b3e203b..2980fbea 100644
--- a/ansible/workers.yml
+++ b/ansible/workers.yml
@@ -1,7 +1,6 @@
 ---
 - hosts: mongodb
 - hosts: navi
-- hosts: charon
 - hosts: rabbitmq
 - hosts: redis
 - hosts: swarm-manager
diff --git a/ssh/config b/ssh/config
index ce3455b2..4334bc4b 100644
--- a/ssh/config
+++ b/ssh/config
@@ -148,6 +148,12 @@ Host delta-api-socket-proxy
 Host delta-app-services
   ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.13.102 22
 
+Host delta-app-services-1
+  ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.14.255 22
+
+Host delta-app-services-2
+  ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.12.61 22
+
 Host delta-dock-services
   ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.5.63 22