diff --git a/tools/docker-compose/compose.yaml b/tools/docker-compose/compose.yaml
index b809f1356..248526234 100644
--- a/tools/docker-compose/compose.yaml
+++ b/tools/docker-compose/compose.yaml
@@ -76,7 +76,7 @@ services:
       - ANSIBLE_WCA_HEALTHCHECK_MODEL_ID=${ANSIBLE_WCA_HEALTHCHECK_MODEL_ID}
       - DEPLOYMENT_MODE=${DEPLOYMENT_MODE}
     command:
-      - /etc/wisdom/scripts/launch-wisdom-compose.sh
+      - /etc/wisdom/scripts/launch-wisdom.sh
     networks:
       - dbnet
   db:
diff --git a/tools/scripts/launch-wisdom-compose.sh b/tools/scripts/launch-wisdom-compose.sh
deleted file mode 100755
index c2f94aea2..000000000
--- a/tools/scripts/launch-wisdom-compose.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-if [[ -n ${DJANGO_SETTINGS_MODULE} ]] && [[ ${DJANGO_SETTINGS_MODULE} == main.settings* ]]; then
-    export DJANGO_SETTINGS_MODULE=ansible_wisdom.${DJANGO_SETTINGS_MODULE}
-fi
-
-database_ready() {
-/var/www/venv/bin/python <<EOF
-import sys
-from django.db import connection
-
-try:
-    connection.ensure_connection()
-except Exception:
-    sys.exit(1)
-EOF
-}
-
-until database_ready
-do
-    echo "Waiting until the database is ready..."
-    sleep 5
-done
-
-/var/www/venv/bin/wisdom-manage migrate --noinput
-/var/www/venv/bin/wisdom-manage createcachetable
-/var/www/venv/bin/wisdom-manage collectstatic --noinput
-/var/www/venv/bin/wisdom-manage createapplication --name "Ansible Lightspeed for VS Code" --client-id Vu2gClkeR5qUJTUGHoFAePmBznd6RZjDdy5FW2wy --redirect-uris "vscode://redhat.ansible vscodium://redhat.ansible vscode-insiders://redhat.ansible code-oss://redhat.ansible checode://redhat.ansible" public authorization-code
-
-/usr/local/bin/supervisord -n
diff --git a/tools/scripts/launch-wisdom.sh b/tools/scripts/launch-wisdom.sh
index 4b24d6c84..cc1405761 100755
--- a/tools/scripts/launch-wisdom.sh
+++ b/tools/scripts/launch-wisdom.sh
@@ -30,6 +30,9 @@ if [ "${DEPLOYMENT_MODE}" == "upstream" ]; then
     echo "Creating a testing user for upstream mode..."
     /var/www/venv/bin/python ansible_wisdom/manage.py createtoken --username testuser --password testuser --token-name testuser_token --create-user
 fi
+if [ ! "${DEPLOYMENT_MODE}" == "saas" ]; then
+    /var/www/venv/bin/wisdom-manage createapplication --name "Ansible Lightspeed for VS Code" --client-id Vu2gClkeR5qUJTUGHoFAePmBznd6RZjDdy5FW2wy --redirect-uris "vscode://redhat.ansible vscodium://redhat.ansible vscode-insiders://redhat.ansible code-oss://redhat.ansible checode://redhat.ansible" public authorization-code
+fi
 /var/www/venv/bin/wisdom-manage collectstatic --noinput
 
 /usr/local/bin/supervisord -n