diff --git a/.cirrus.yml b/.cirrus.yml
index dbc399b3..badf73e8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,8 +11,8 @@ env:
   STAGING_IMAGE_NAME: sonarsource/sonarqube
   PUBLIC_IMAGE_NAME: sonarqube
   CURRENT_LTS_VERSION: 9.9.3
-  CURRENT_VERSION: 10.3.0
-  NEXT_VERSION: 10.4.0
+  CURRENT_VERSION: 10.4.0
+  NEXT_VERSION: 10.5.0
 
 
 vm_instance_template: &VM_TEMPLATE
diff --git a/10/community/Dockerfile b/10/community/Dockerfile
index cd8dac84..d6246686 100644
--- a/10/community/Dockerfile
+++ b/10/community/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87240
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile
index 320b3c20..be2df8c9 100644
--- a/10/datacenter/app/Dockerfile
+++ b/10/datacenter/app/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87240
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile
index a84cf780..854b51ce 100644
--- a/10/datacenter/search/Dockerfile
+++ b/10/datacenter/search/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87240
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile
index c686a528..ff3aa639 100644
--- a/10/developer/Dockerfile
+++ b/10/developer/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87240
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile
index 98314655..f311ff37 100644
--- a/10/enterprise/Dockerfile
+++ b/10/enterprise/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87240
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
diff --git a/run-tests.sh b/run-tests.sh
index 52099157..10d9a382 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -42,7 +42,7 @@ require() {
 wait_for_sonarqube() {
     local image=$1 i web_up=no sonarqube_up=no
 
-    for ((i = 0; i < 10; i++)); do
+    for ((i = 0; i < 15; i++)); do
         info "$image: waiting for web server to start ..."
         if curl -sI localhost:$port | grep '^HTTP/.* 200'; then
             web_up=yes
@@ -53,7 +53,7 @@ wait_for_sonarqube() {
 
     [[ $web_up = yes ]] || return 1
 
-    for ((i = 0; i < 20; i++)); do
+    for ((i = 0; i < 30; i++)); do
         info "$image: waiting for sonarqube to be ready ..."
         if curl -s localhost:$port/api/system/status | grep '"status":"UP"'; then
             sonarqube_up=yes