diff --git a/deploy_kubeinvaders.sh b/deploy_kubeinvaders.sh
index 92533e0..948a610 100644
--- a/deploy_kubeinvaders.sh
+++ b/deploy_kubeinvaders.sh
@@ -8,11 +8,10 @@ kubectl apply -f kubernetes/kubeinvaders-namespace.yml
 kubectl apply -f kubernetes/kubeinvaders-deployment.yml -n kubeinvaders
 kubectl expose deployment  kubeinvaders --type=NodePort --name=kubeinvaders -n kubeinvaders --port 8080
 kubectl apply -f kubernetes/kubeinvaders-ingress.yml -n kubeinvaders
-kubectl create sa kubeinvaders -n foobar
+kubectl create sa kubeinvaders -n $TARGET_NAMESPACE
 kubectl apply -f kubernetes/kubeinvaders-role.yml
 kubectl apply -f kubernetes/kubeinvaders-rolebinding.yml
-TOKEN=`kubectl describe secret $(kubectl get secret -n foobar | grep 'kubeinvaders-token' | awk '{ print $1}') -n foobar | grep 'token:' | awk '{ print $2}'`
-kubectl apply -f kubernetes/kubeinvaders-role.yml
+TOKEN=`kubectl describe secret $(kubectl get secret -n $TARGET_NAMESPACE | grep 'kubeinvaders-token' | awk '{ print $1}') -n $TARGET_NAMESPACE | grep 'token:' | awk '{ print $2}'`
 kubectl set env deployment/kubeinvaders TOKEN=$TOKEN -n kubeinvaders
 kubectl set env deployment/kubeinvaders NAMESPACE=$TARGET_NAMESPACE -n kubeinvaders
 kubectl set env deployment/kubeinvaders ROUTE_HOST=$ROUTE_HOST -n kubeinvaders