diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index d70617c..61f15cc 100755
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -709,11 +709,12 @@ _main_mariadb() {
 			docker_mariadb_upgrade "$@"
 		fi
 	fi
+	exec "$@"
+}
 
+_check_to_run_teleport() {
 	if [ -f "/etc/teleport.yaml" ]; then
-		exec "$@" &
-	else
-		exec "$@"
+    teleport start -c /etc/teleport.yaml &
 	fi
 }
 
@@ -736,12 +737,8 @@ _run_web_server() {
 
 # If we are sourced from elsewhere, don't perform any further actions
 if ! _is_sourced; then
+	_check_to_run_teleport
 	_run_web_server
 
-	if [ -f "/etc/teleport.yaml" ]; then
-		_main_mariadb "$@"
-    teleport start -c /etc/teleport.yaml
-	else
-		_main_mariadb "$@"
-	fi
+	_main_mariadb "$@"
 fi