diff --git a/cf-keycloak.sh b/cf-keycloak.sh
index 1aa794c..384a0f2 100755
--- a/cf-keycloak.sh
+++ b/cf-keycloak.sh
@@ -1,5 +1,14 @@
 #!/usr/bin/env bash
 
+space=$(cf target | awk '{print $2}' | sed -n 5p)
+
+if [[ $space = "rtwp" ]]; then
+  echo "Deploying to the ${space} space"
+else
+  echo "Login to the 'rtwp' space before deploying keycloak './cf-login.sh rtwp'"
+  exit 1
+fi  
+
 app=rtwp-keycloak
 
 cf push $app \
diff --git a/cf-login.sh b/cf-login.sh
index 3ca6604..a1a2ac9 100755
--- a/cf-login.sh
+++ b/cf-login.sh
@@ -4,6 +4,6 @@ api_url=https://api.cf.us10.hana.ondemand.com
 username=$CP_USER
 password=$CP_PASSWORD
 org=ns2-presales
-space=rtwp
+space=$1
 
 cf login -a $api_url -u $username -p $password -o $org -s $space
\ No newline at end of file
diff --git a/cf-rtwp-admin.sh b/cf-rtwp-admin.sh
index accd74b..a0f495b 100755
--- a/cf-rtwp-admin.sh
+++ b/cf-rtwp-admin.sh
@@ -1,22 +1,21 @@
 #!/usr/bin/env bash
 
-status=$(cf app rtwp-keycloak | sed -n 3p)
-if [[ $status = "FAILED" ]]; then
+prefix=$1-
+
+if [[ -z "${KEYCLOAK_URL}" ]]; then
+  echo "KEYCLOAK_URL environment variable is not set'"
   exit 1
-else
-   keycloak_url=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
-   echo keycloak_url=$keycloak_url
 fi
 
-status=$(cf app rtwp-api | sed -n 3p)
+status=$(cf app ${prefix}rtwp-api | sed -n 3p)
 if [[ $status = "FAILED" ]]; then
   exit 1
 else
-  express_url=https://$(cf app rtwp-api | awk '{print $2}' | sed -n 5p)/
+  express_url=https://$(cf app ${prefix}rtwp-api | awk '{print $2}' | sed -n 5p)/
   echo express_url=$express_url
 fi
 
-app=rtwp-admin
+app=${prefix}rtwp-admin
 
 cd rtwp-admin
 
diff --git a/cf-rtwp-api.sh b/cf-rtwp-api.sh
index 5b1b0c8..e912270 100755
--- a/cf-rtwp-api.sh
+++ b/cf-rtwp-api.sh
@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 
-status=$(cf app rtwp-keycloak | sed -n 3p)
-if [[ $status = "FAILED" ]]; then
+prefix=$1-
+
+if [[ -z "${KEYCLOAK_URL}" ]]; then
+  echo "KEYCLOAK_URL environment variable is not set'"
   exit 1
-else
-  keycloak_url=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
-  echo keycloak_url=$keycloak_url
 fi
 
 service=rtwp-hdi-hana
@@ -14,7 +13,7 @@ if [[ $status = "FAILED" ]]; then
   exit 1
 fi
 
-app=rtwp-api
+app=${prefix}rtwp-api
 
 cd rtwp-api