diff --git a/installer/start-all.sh b/installer/start-all.sh
index 5362f0875..fde7ddc28 100644
--- a/installer/start-all.sh
+++ b/installer/start-all.sh
@@ -3,11 +3,17 @@
 set -e
 
 if [ "$MAXKB_DB_HOST" = "127.0.0.1" ]; then
-    /usr/bin/start-postgres.sh
+  echo "PostgreSQL starting..."
+  /usr/bin/start-postgres.sh &
+  sleep 10
+  wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo "PostgreSQL started."
 fi
 
 if [ "$MAXKB_REDIS_HOST" = "127.0.0.1" ]; then
-    /usr/bin/start-redis.sh
+  echo "Redis starting..."
+  /usr/bin/start-redis.sh &
+  sleep 5
+  wait-for-it 127.0.0.1:6379 --timeout=60 --strict -- echo "Redis started."
 fi
 
 /usr/bin/start-maxkb.sh
\ No newline at end of file
diff --git a/installer/start-postgres.sh b/installer/start-postgres.sh
index ee3f5397e..66736088b 100644
--- a/installer/start-postgres.sh
+++ b/installer/start-postgres.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
 mkdir -p /opt/maxkb/data/postgresql
-echo "PostgreSQL starting..."
-docker-entrypoint.sh postgres -c max_connections=${POSTGRES_MAX_CONNECTIONS} &
-sleep 10
-wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo "PostgreSQL started."
\ No newline at end of file
+docker-entrypoint.sh postgres -c max_connections=${POSTGRES_MAX_CONNECTIONS}
diff --git a/installer/start-redis.sh b/installer/start-redis.sh
index d3f6766c2..c7ebbae1d 100644
--- a/installer/start-redis.sh
+++ b/installer/start-redis.sh
@@ -7,7 +7,5 @@ if [ ! -f /opt/maxkb/conf/redis.conf ]; then
   touch /opt/maxkb/conf/redis.conf
   printf "bind 0.0.0.0\nport 6379\ndatabases 16\nmaxmemory 1G\nmaxmemory-policy allkeys-lru\ndir /opt/maxkb/data/redis\nrequirepass "${REDIS_PASSWORD}"\n" > /opt/maxkb/conf/redis.conf
 fi
-echo "Redis starting..."
-redis-server /opt/maxkb/conf/redis.conf &
-sleep 5
-wait-for-it 127.0.0.1:6379 --timeout=60 --strict -- echo "Redis started."
\ No newline at end of file
+
+redis-server /opt/maxkb/conf/redis.conf
\ No newline at end of file