diff --git a/container/webui/docker-compose.yaml b/container/webui/docker-compose.yaml
index 03531191b36..b7e50a13028 100644
--- a/container/webui/docker-compose.yaml
+++ b/container/webui/docker-compose.yaml
@@ -126,8 +126,7 @@ services:
       start_period: 5s
 
   db:
-    # Teporary fix version https://progress.opensuse.org/issues/167524
-    image: postgres:16
+    image: postgres
     restart: always
     environment:
       POSTGRES_PASSWORD: openqa
@@ -136,7 +135,12 @@ services:
     volumes:
       - ./workdir/db:/var/lib/postgresql/data:Z
     healthcheck:
-      test: ["CMD", "sh", "-c", "echo 'select * from api_keys;' | psql -U openqa -v 'ON_ERROR_STOP=1' openqa"]
+      test:
+        - CMD-SHELL
+        - >-
+          pg_isready -U openqa -d openqa
+          && echo 'select * from api_keys;'
+          | psql -U openqa -v 'ON_ERROR_STOP=1' openqa
       interval: 10s
       timeout: 10s
       retries: 3
diff --git a/container/webui/run_openqa.sh b/container/webui/run_openqa.sh
index 51d4630ea50..a6e0da26f05 100644
--- a/container/webui/run_openqa.sh
+++ b/container/webui/run_openqa.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 set -e
 
-function wait_for_db_creation() {
-    echo "Waiting for DB creation"
-    while ! su geekotest -c 'PGPASSWORD=openqa psql -h db -U openqa --list | grep -qe openqa'; do sleep .1; done
-}
-
 function upgradedb() {
-    wait_for_db_creation
     su geekotest -c '/usr/share/openqa/script/upgradedb --upgrade_database'
 }
 
@@ -20,17 +14,14 @@ function websockets() {
 }
 
 function gru() {
-    wait_for_db_creation
     su geekotest -c /usr/share/openqa/script/openqa-gru
 }
 
 function livehandler() {
-    wait_for_db_creation
     su geekotest -c /usr/share/openqa/script/openqa-livehandler-daemon
 }
 
 function webui() {
-    wait_for_db_creation
     su geekotest -c /usr/share/openqa/script/openqa-webui-daemon
 }