diff --git a/1601-centos72-aio.cfg b/1601-centos72-aio.cfg
index a199816..e4ea4da 100644
--- a/1601-centos72-aio.cfg
+++ b/1601-centos72-aio.cfg
@@ -4,7 +4,7 @@
 forks = 50
 remote_user = centos
 private_key_file = ~/.ssh/id_rsa
-roles_path = ~/apigee-workspace/opdk-workspace/archives/apigee-opdk-playbooks
+roles_path = ~/.ansible/roles
 log_path = ~/.ansible/tmp/ansible.log
 retry_files_enabled = False
 executable = /bin/bash
diff --git a/1601-oraclelinux68-baas.cfg b/1601-oraclelinux68-baas.cfg
new file mode 100644
index 0000000..fc1e904
--- /dev/null
+++ b/1601-oraclelinux68-baas.cfg
@@ -0,0 +1,23 @@
+[defaults]
+host_key_checking = false
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-baas/
+forks = 50
+remote_user = ec2-user
+private_key_file = ~/.ssh/id_rsa
+roles_path = ~/.ansible/roles
+log_path = ~/.ansible/tmp/ansible.log
+retry_files_enabled = False
+executable = /bin/bash
+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
diff --git a/1601-rhel72-baas.cfg b/1601-rhel72-baas.cfg
new file mode 100644
index 0000000..24c913d
--- /dev/null
+++ b/1601-rhel72-baas.cfg
@@ -0,0 +1,23 @@
+[defaults]
+host_key_checking = false
+hostfile = ~/.ansible/inventory/aws/1601-rhel72-baas/
+forks = 50
+remote_user = centos
+private_key_file = ~/.ssh/id_rsa
+roles_path = ~/apigee-workspace/opdk-workspace/archives/apigee-opdk-playbooks
+log_path = ~/.ansible/tmp/ansible.log
+retry_files_enabled = False
+executable = /bin/bash
+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