diff --git a/baas-1601-dc1.cfg b/baas-1601-dc1.cfg
index 1909053..8ff5d57 100644
--- a/baas-1601-dc1.cfg
+++ b/baas-1601-dc1.cfg
@@ -11,7 +11,7 @@
 library = ~/.ansible/library/
 
 host_key_checking = false
-forks = 15
+forks = 10
 retry_files_enabled = False
 # executable = /bin/bash
 executable = sh
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/baas-1701-dc5-dc6.cfg b/baas-1701-dc5-dc6.cfg
index 08579ab..c09e6f4 100644
--- a/baas-1701-dc5-dc6.cfg
+++ b/baas-1701-dc5-dc6.cfg
@@ -11,7 +11,7 @@
 library = ~/.ansible/library/
 
 host_key_checking = false
-forks = 15
+forks = 10
 retry_files_enabled = False
 # executable = /bin/bash
 executable = sh
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/baas-1701-dc5.cfg b/baas-1701-dc5.cfg
index 4cbd28d..d2f21dd 100644
--- a/baas-1701-dc5.cfg
+++ b/baas-1701-dc5.cfg
@@ -11,7 +11,7 @@
 library = ~/.ansible/library/
 
 host_key_checking = false
-forks = 15
+forks = 10
 retry_files_enabled = False
 # executable = /bin/bash
 executable = sh
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/baas-1701-dc6.cfg b/baas-1701-dc6.cfg
index bc492b4..f4a4730 100644
--- a/baas-1701-dc6.cfg
+++ b/baas-1701-dc6.cfg
@@ -11,7 +11,7 @@
 library = ~/.ansible/library/
 
 host_key_checking = false
-forks = 15
+forks = 10
 retry_files_enabled = False
 # executable = /bin/bash
 executable = sh
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-aio.cfg b/edge-1601-aio.cfg
index 3b960bb..cecf9fc 100644
--- a/edge-1601-aio.cfg
+++ b/edge-1601-aio.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-cassandra-replication-factor-lab.cfg b/edge-1601-cassandra-replication-factor-lab.cfg
index ba290a7..4c8cea7 100644
--- a/edge-1601-cassandra-replication-factor-lab.cfg
+++ b/edge-1601-cassandra-replication-factor-lab.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc1-dc2.cfg b/edge-1601-dc1-dc2.cfg
index f6f6b1f..0e5243c 100644
--- a/edge-1601-dc1-dc2.cfg
+++ b/edge-1601-dc1-dc2.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-# fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc1.cfg b/edge-1601-dc1.cfg
index eb77520..77b0d25 100644
--- a/edge-1601-dc1.cfg
+++ b/edge-1601-dc1.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc2.cfg b/edge-1601-dc2.cfg
index f89ba48..a5f0828 100644
--- a/edge-1601-dc2.cfg
+++ b/edge-1601-dc2.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc3-dc4.cfg b/edge-1601-dc3-dc4.cfg
index 5c836ab..34d7419 100644
--- a/edge-1601-dc3-dc4.cfg
+++ b/edge-1601-dc3-dc4.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc3.cfg b/edge-1601-dc3.cfg
index 898d74d..e759ae0 100644
--- a/edge-1601-dc3.cfg
+++ b/edge-1601-dc3.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc4.cfg b/edge-1601-dc4.cfg
index c53fa09..1f75f5d 100644
--- a/edge-1601-dc4.cfg
+++ b/edge-1601-dc4.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc5-dc6.cfg b/edge-1601-dc5-dc6.cfg
index 962c82d..a520519 100644
--- a/edge-1601-dc5-dc6.cfg
+++ b/edge-1601-dc5-dc6.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-#fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc5.cfg b/edge-1601-dc5.cfg
index e422158..08fe48f 100644
--- a/edge-1601-dc5.cfg
+++ b/edge-1601-dc5.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1601-dc6.cfg b/edge-1601-dc6.cfg
index 7d08f39..8d021fc 100644
--- a/edge-1601-dc6.cfg
+++ b/edge-1601-dc6.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1605-dc3.cfg b/edge-1605-dc3.cfg
index fd04bd3..3a263d7 100644
--- a/edge-1605-dc3.cfg
+++ b/edge-1605-dc3.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1609-dc2.cfg b/edge-1609-dc2.cfg
index 33a74ba..4c43825 100644
--- a/edge-1609-dc2.cfg
+++ b/edge-1609-dc2.cfg
@@ -3,7 +3,7 @@
 fact_caching_connection = ~/.ansible/tmp/cache/edge-1609-dc2
 log_path = ~/.ansible/tmp/logs/edge-1609-dc2.log
 
-remote_user = centos
+remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
 
 roles_path = ~/.ansible/roles
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1609-dc3-dc4.cfg b/edge-1609-dc3-dc4.cfg
index b2357a3..df0df4d 100644
--- a/edge-1609-dc3-dc4.cfg
+++ b/edge-1609-dc3-dc4.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1609-dc3.cfg b/edge-1609-dc3.cfg
index 0f6646e..0eb82c2 100644
--- a/edge-1609-dc3.cfg
+++ b/edge-1609-dc3.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1609-dc4.cfg b/edge-1609-dc4.cfg
index 6abc72d..939991a 100644
--- a/edge-1609-dc4.cfg
+++ b/edge-1609-dc4.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1701-dc2.cfg b/edge-1701-dc2.cfg
index 01ce854..c3d1163 100644
--- a/edge-1701-dc2.cfg
+++ b/edge-1701-dc2.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-1701-dc5.cfg b/edge-1701-dc5.cfg
index 33e8ced..7d80068 100644
--- a/edge-1701-dc5.cfg
+++ b/edge-1701-dc5.cfg
@@ -20,8 +20,10 @@
 fact_caching = jsonfile
 module_name = shell
 
-# 2 hour timeout
-fact_caching_timeout = 7200
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+
 timeout = 60
 
 [ssh_connection]
diff --git a/edge-baas-portal-1701-dc7.cfg b/edge-baas-portal-1701-dc7.cfg
index 3743c24..e3b84c1 100644
--- a/edge-baas-portal-1701-dc7.cfg
+++ b/edge-baas-portal-1701-dc7.cfg
@@ -16,20 +16,17 @@
 # executable = /bin/bash
 executable = sh
 ansible_shell_type=sh
+gathering = smart
+fact_caching = jsonfile
 module_name = shell
 
-# Caching attributes
-gathering = smart
-# fact_caching = redis
-fact_caching = jsonfile
-# fact_caching_timeout = 7200
-fact_caching_timeout = 86400
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
 
-# 2 hour timeout
 timeout = 60
 
 [ssh_connection]
 ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
 control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
 pipelining = True
-
diff --git a/vagrant-aio.cfg b/vagrant-aio.cfg
deleted file mode 100644
index 5c9f20a..0000000
--- a/vagrant-aio.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/vagrant
-forks = 10
-remote_user = vagrant
-private_key_file = ~/.vagrant.d/insecure_private_key
-roles_path = ~/.ansible/roles
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-# executable = /bin/bash
-executable = sh
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-# library = ~/.ansible/library/
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r