diff --git a/run.sh b/run.sh
index 265924e066309638c7c01aa9bb6b7d41418cdf89..6a8809ab3894d2d0b3fad0f4fc322c61dd1b36ba 100755
--- a/run.sh
+++ b/run.sh
@@ -44,6 +44,12 @@ if [[ $docker == "false" ]]; then
 		./manage.py createsuperuser --noinput
 		echo "create rsa key"
 		./manage.py creatersakey
+		if [[ -z ${TANK_CALLBACK_BASE_URL} ]]; then
+			DASHBOARD_CALLBACK_BASE_URL="${AURA_PROTO}://${AURA_HOST}/tank"
+		fi
+		if [[ -z ${DASHBOARD_CALLBACK_BASE_URL} ]]; then
+			DASHBOARD_CALLBACK_BASE_URL="${AURA_PROTO}://${AURA_HOST}"
+		fi
 		echo "create dashboard client with client id $DASHBOARD_OIDC_CLIENT_ID"
     	./manage.py create_oidc_client dashboard public --client-id $DASHBOARD_OIDC_CLIENT_ID --client-secret $DASHBOARD_OIDC_CLIENT_SECRET -r "id_token token" -u ${DASHBOARD_CALLBACK_BASE_URL}/oidc_callback.html -u ${DASHBOARD_CALLBACK_BASE_URL}/oidc_callback_silentRenew.html -p ${DASHBOARD_CALLBACK_BASE_URL}
     	echo "create tank client with client id $TANK_OIDC_CLIENT_ID"