diff --git a/group_vars/all/connect.yml b/group_vars/all/connect.yml
new file mode 100644
index 0000000..99a49c5
--- /dev/null
+++ b/group_vars/all/connect.yml
@@ -0,0 +1,4 @@
+---
+
+connect_client_admin_username: "connect-admin"
+connect_realm_admin_username: "connect-realm-admin"
diff --git a/roles/connect_realm/defaults/main.yml b/roles/connect_realm/defaults/main.yml
index 4e59976..627a072 100644
--- a/roles/connect_realm/defaults/main.yml
+++ b/roles/connect_realm/defaults/main.yml
@@ -1,10 +1,6 @@
 ---
 
-# TODO inject by management portal
-connect_client_admin_username: "connect-admin"
 connect_client_admin_password: "C0nnect-Admin!"
-# TODO inject by management portal
-connect_realm_admin_username: "connect-realm-admin"
 connect_realm_admin_password: "C0nnect-Realm-Admin!"
 
 current_realm_clients: [