diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/runOracle.sh
index cb94a9f00f..835f9228ed 100755
--- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/runOracle.sh
+++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/runOracle.sh
@@ -179,7 +179,9 @@ fi;
 
 # Check whether database is up and running
 $ORACLE_BASE/$CHECK_DB_FILE
-if [ $? -eq 0 ]; then
+status=$?
+
+if [ $status -eq 0 ]; then
   echo "#########################"
   echo "DATABASE IS READY TO USE!"
   echo "#########################"
@@ -196,6 +198,13 @@ else
   echo "#####################################"
 fi;
 
+# Exiting the script without waiting on the tail logs
+if [ "$1" = "--nowait" ]; then
+   # Creating state-file for identifying container of the prebuiltdb extended image
+   touch "${ORACLE_BASE}/oradata/${ORACLE_SID}/.prebuiltdb"
+   exit $status;
+fi
+
 # Tail on alert log and wait (otherwise container will exit)
 echo "The following output is now a tail of the alert.log:"
 tail -f $ORACLE_BASE/diag/rdbms/*/*/trace/alert*.log &
diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/runOracle.sh
index cb94a9f00f..835f9228ed 100755
--- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/runOracle.sh
+++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/runOracle.sh
@@ -179,7 +179,9 @@ fi;
 
 # Check whether database is up and running
 $ORACLE_BASE/$CHECK_DB_FILE
-if [ $? -eq 0 ]; then
+status=$?
+
+if [ $status -eq 0 ]; then
   echo "#########################"
   echo "DATABASE IS READY TO USE!"
   echo "#########################"
@@ -196,6 +198,13 @@ else
   echo "#####################################"
 fi;
 
+# Exiting the script without waiting on the tail logs
+if [ "$1" = "--nowait" ]; then
+   # Creating state-file for identifying container of the prebuiltdb extended image
+   touch "${ORACLE_BASE}/oradata/${ORACLE_SID}/.prebuiltdb"
+   exit $status;
+fi
+
 # Tail on alert log and wait (otherwise container will exit)
 echo "The following output is now a tail of the alert.log:"
 tail -f $ORACLE_BASE/diag/rdbms/*/*/trace/alert*.log &
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runOracle.sh
index 2a5bcc2908..f00a908031 100755
--- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runOracle.sh
+++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runOracle.sh
@@ -319,7 +319,7 @@ fi;
 
 # Exiting the script without waiting on the tail logs
 if [ "$1" = "--nowait" ]; then
-   # Creating state-file for identifyig container of the prebuiltdb extended image
+   # Creating state-file for identifying container of the prebuiltdb extended image
    touch "${ORACLE_BASE}/oradata/${ORACLE_SID}/.prebuiltdb"
    exit $status;
 fi
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runOracle.sh
index c8f1d734a7..5572f5139b 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runOracle.sh
+++ b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runOracle.sh
@@ -329,7 +329,7 @@ fi;
 
 # Exiting the script without waiting on the tail logs
 if [ "$1" = "--nowait" ]; then
-   # Creating state-file for identifyig container of the prebuiltdb extended image
+   # Creating state-file for identifying container of the prebuiltdb extended image
    touch "${ORACLE_BASE}/oradata/${ORACLE_SID}/.prebuiltdb"
    exit $status;
 fi
diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.4.0/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/23.4.0/runOracle.sh
index 275f68735a..9bb97fc760 100755
--- a/OracleDatabase/SingleInstance/dockerfiles/23.4.0/runOracle.sh
+++ b/OracleDatabase/SingleInstance/dockerfiles/23.4.0/runOracle.sh
@@ -342,7 +342,7 @@ fi;
 
 # Exiting the script without waiting on the tail logs
 if [ "$1" = "--nowait" ]; then
-   # Creating state-file for identifyig container of the prebuiltdb extended image
+   # Creating state-file for identifying container of the prebuiltdb extended image
    touch "${ORACLE_BASE}/oradata/${ORACLE_SID}/.prebuiltdb"
    exit $status;
 fi