diff --git a/docker/entrypoint-celery-beat.sh b/docker/entrypoint-celery-beat.sh
index 7b2eab0968..a185493fe9 100755
--- a/docker/entrypoint-celery-beat.sh
+++ b/docker/entrypoint-celery-beat.sh
@@ -2,6 +2,7 @@
 
 set -e  # needed to handle "exit" correctly
 
+. /secret-file-loader.sh
 . /reach_database.sh
 
 umask 0002
diff --git a/docker/entrypoint-uwsgi-dev.sh b/docker/entrypoint-uwsgi-dev.sh
index b1c9cfe1cc..ee126305ac 100755
--- a/docker/entrypoint-uwsgi-dev.sh
+++ b/docker/entrypoint-uwsgi-dev.sh
@@ -3,7 +3,10 @@
 set -e  # needed to handle "exit" correctly
 
 . /secret-file-loader.sh
+. /reach_database.sh
 
+wait_for_database_to_be_reachable
+echo
 
 cd /app || exit
 
diff --git a/docker/entrypoint-uwsgi.sh b/docker/entrypoint-uwsgi.sh
index 6fe962f621..343aaf12fe 100755
--- a/docker/entrypoint-uwsgi.sh
+++ b/docker/entrypoint-uwsgi.sh
@@ -3,6 +3,7 @@
 set -e  # needed to handle "exit" correctly
 
 . /secret-file-loader.sh
+. /reach_database.sh
 
 # Allow for bind-mount multiple settings.py overrides
 FILES=$(ls /app/docker/extra_settings/* 2>/dev/null || true)
@@ -17,6 +18,9 @@ if [ "$NUM_FILES" -gt 0 ]; then
     rm -f /app/dojo/settings/README.md
 fi
 
+wait_for_database_to_be_reachable
+echo
+
 umask 0002
 
 # do the check with Django stack
diff --git a/docker/reach_database.sh b/docker/reach_database.sh
index 819f69282e..536e2c9f09 100644
--- a/docker/reach_database.sh
+++ b/docker/reach_database.sh
@@ -6,11 +6,22 @@ wait_for_database_to_be_reachable() {
     DD_DATABASE_READINESS_TIMEOUT=${DD_DATABASE_READINESS_TIMEOUT:-30}
     until echo "select 1;" | python3 manage.py dbshell > /dev/null
     do 
-    echo -n "."
-    failure_count=$((failure_count + 1)) 
-    sleep 1
-    if [ $DD_DATABASE_READINESS_TIMEOUT = $failure_count ]; then
-        exit 1
-    fi
+        echo -n "."
+        failure_count=$((failure_count + 1)) 
+        sleep 1
+        if [ $DD_DATABASE_READINESS_TIMEOUT = $failure_count ]; then
+            exit 1
+        fi
     done
+    cat <<EOD | python manage.py shell
+from django.db import connections
+connections['default'].cursor()
+EOD
+    DB_TEST=$?
+    if [[ $DB_TEST -ne 0 ]]; then
+        echo "Simple database test failed with $DB_TEST"
+    else
+        echo "Simple database test was successful"
+    fi
+    return $DB_TEST 
 }
\ No newline at end of file