diff --git a/ci/autoscaler/scripts/common.sh b/ci/autoscaler/scripts/common.sh
index 9a311e822b..ffff630150 100644
--- a/ci/autoscaler/scripts/common.sh
+++ b/ci/autoscaler/scripts/common.sh
@@ -99,6 +99,10 @@ function cleanup_apps(){
   if ! cf spaces | grep --quiet --regexp="^${AUTOSCALER_SPACE}$"; then
     cf delete-space -f "${AUTOSCALER_SPACE}"
   fi
+
+  if ! cf orgs | grep --quiet --regexp="^${AUTOSCALER_ORG}$"; then
+    cf delete-org -f "${AUTOSCALER_ORG}"
+  fi
 }
 
 
diff --git a/ci/autoscaler/scripts/vars.source.sh b/ci/autoscaler/scripts/vars.source.sh
index dd18256454..b7b925a2ac 100644
--- a/ci/autoscaler/scripts/vars.source.sh
+++ b/ci/autoscaler/scripts/vars.source.sh
@@ -53,8 +53,7 @@ debug "DEPLOYMENT_NAME: ${DEPLOYMENT_NAME}"
 log "set up vars: DEPLOYMENT_NAME=${DEPLOYMENT_NAME}"
 deployment_name="${DEPLOYMENT_NAME}"
 
-export AUTOSCALER_ORG="${AUTOSCALER_ORG:-"autoscaler-${PR_NUMBER}"}"
-[ "${AUTOSCALER_ORG}" = "autoscaler-" ] && AUTOSCALER_ORG="${user}"
+export AUTOSCALER_ORG="${AUTOSCALER_ORG:-$DEPLOYMENT_NAME}"
 debug "AUTOSCALER_ORG: ${AUTOSCALER_ORG}"
 log "set up vars: AUTOSCALER_ORG=${AUTOSCALER_ORG}"
 autoscaler_org="${AUTOSCALER_ORG}"