diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 7ab54055e0794862dc634089a4c1b99cc5f21fcf..c0b71fcd3be846f3c87fdd369c49072049f782db 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -13,11 +13,16 @@
 
   root_ssh_key: ""
 
+# cheaha.node related
   hostname_lookup_table:
-    - "172.20.0.24 cheaha-master02.cm.cluster cheaha-master02"
-    - "172.20.0.22 cheaha-master01.cm.cluster cheaha-master01"
-    - "172.20.0.25 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
+    - "10.141.255.254 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
 
-  bright_openldap_path: "/cm/local/apps/openldap"
-  ldap_cert_path: "{{bright_openldap_path}}/etc/certs"
+# ldap_config related
+  ldap_cert_path: "/etc/openldap/certs"
+  ldap_uri: "ldap://ldapserver"
+
+# nfs_mounts related
+  mount_points:
+    - /gpfs4
+    - /gpfs5
 
diff --git a/ansible/group_vars/knightly b/ansible/group_vars/knightly
new file mode 100644
index 0000000000000000000000000000000000000000..ee662aad4834e0ac34731f05364c7b6a4639af76
--- /dev/null
+++ b/ansible/group_vars/knightly
@@ -0,0 +1,9 @@
+---
+  hostname_lookup_table:
+    - "172.20.0.24 cheaha-master02.cm.cluster cheaha-master02"
+    - "172.20.0.22 cheaha-master01.cm.cluster cheaha-master01"
+    - "172.20.0.25 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
+
+  bright_openldap_path: "/cm/local/apps/openldap"
+  ldap_cert_path: "{{bright_openldap_path}}/etc/certs"
+  ldap_uri: "ldaps://ldapserver"
diff --git a/ansible/group_vars/proxy b/ansible/group_vars/proxy
deleted file mode 100644
index 819e47c9cf483ea81892bcb88496be87f5924131..0000000000000000000000000000000000000000
--- a/ansible/group_vars/proxy
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  hostname_lookup_table:
-    - "10.141.255.254 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
-
-  ldap_cert_path: "/etc/openldap/certs"
-
-  mount_points:
-    - /gpfs4
-    - /gpfs5
-