diff --git a/index.sh b/index.sh
index 4ab4327..1d8eab6 100755
--- a/index.sh
+++ b/index.sh
@@ -56,12 +56,12 @@ if [[ -v sso_token ]]; then
     curl "${sso_url}/api/group/" \
       -H "auth-token: ${sso_token}" \
       -H "content-type: application/json; charset=UTF-8" \
-      --data-binary "{\"name\":\"${ldapLocation}_host_${current_host}_access\",\"description\":\"Access for $current_host\"}"
+      --data-binary "{\"name\":\"${ldap_location}_host_${current_host}_access\",\"description\":\"Access for $current_host\"}"
 
     curl "${sso_url}/api/group/" \
       -H "auth-token: ${sso_token}" \
       -H "content-type: application/json; charset=UTF-8" \
-      --data-binary "{\"name\":\"${ldapLocation}_host_${current_host}_admin\",\"description\":\"sudo for $current_host\"}"
+      --data-binary "{\"name\":\"${ldap_location}_host_${current_host}_admin\",\"description\":\"sudo for $current_host\"}"
 fi
 
 echo "--- SSSD Migration Complete! ---"
diff --git a/ldap.vars.pdp b/ldap.vars.pdp
index b2cde24..3d99ff8 100644
--- a/ldap.vars.pdp
+++ b/ldap.vars.pdp
@@ -8,6 +8,7 @@ export ldap_bind_password=""
 export sso_url="https://sso.theta42.com"
 export sso_token="" # This is the only optional variable
 
-export ldap_location="pdp" 
-export ldap_access_groups=( $ldap_location_access $ldap_location_$(hostname)_access )
-export ldap_sudo_groups=( $ldap_location_admin $ldap_location_$(hostname)_admin )
\ No newline at end of file
+export ldap_location="pdp"
+
+ldap_access_groups=( "${ldap_location}_access" "${ldap_location}_$(hostname)_access" )
+ldap_sudo_groups=( "${ldap_location}_admin" "${ldap_location}_$(hostname)_admin" )