diff --git a/ct/sonarqube.sh b/ct/sonarqube.sh
index ab7cd3c47..78652689f 100644
--- a/ct/sonarqube.sh
+++ b/ct/sonarqube.sh
@@ -39,13 +39,11 @@ function update_script() {
     msg_ok "Created Backup"
 
     msg_info "Updating SonarQube"
-    temp_file=$(mktemp)
-    RELEASE=$(get_latest_github_release "SonarSource/sonarqube")
-    curl -fsSL "https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${RELEASE}.zip" -o $temp_file
-    unzip -q "$temp_file" -d /opt
-    rm -f "$temp_file"
-    mv /opt/sonarqube-${RELEASE} /opt/sonarqube
-    echo "${RELEASE}" > ~/.sonarqube
+    RELEASE=$(curl -fsSL "https://binaries.sonarsource.com/s3api?prefix=Distribution/sonarqube/sonarqube-&delimiter=/" |
+      grep -oP 'sonarqube-[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.zip' |
+      sort -V | tail -n1)
+    fetch_and_deploy_from_url "https://binaries.sonarsource.com/Distribution/sonarqube/${RELEASE}" /opt/sonarqube
+    echo "${RELEASE}" >~/.sonarqube
     msg_ok "Updated SonarQube"
 
     msg_info "Restoring Backup"
diff --git a/install/sonarqube-install.sh b/install/sonarqube-install.sh
index b84d7b03b..f1c799e9f 100644
--- a/install/sonarqube-install.sh
+++ b/install/sonarqube-install.sh
@@ -17,12 +17,10 @@ PG_VERSION="17" setup_postgresql
 PG_DB_NAME="sonarqube" PG_DB_USER="sonarqube" setup_postgresql_db
 
 msg_info "Setting up SonarQube"
-temp_file=$(mktemp)
-RELEASE=$(get_latest_github_release "SonarSource/sonarqube")
-curl -fsSL "https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${RELEASE}.zip" -o $temp_file
-unzip -q "$temp_file" -d /opt
-rm -f "$temp_file"
-mv /opt/sonarqube-* /opt/sonarqube
+RELEASE=$(curl -s "https://binaries.sonarsource.com/s3api?prefix=Distribution/sonarqube/sonarqube-&delimiter=/" |
+  grep -oP 'sonarqube-[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.zip' |
+  sort -V | tail -n1)
+fetch_and_deploy_from_url "https://binaries.sonarsource.com/Distribution/sonarqube/${RELEASE}" /opt/sonarqube
 $STD useradd -r -m -U -d /opt/sonarqube -s /bin/bash sonarqube
 chown -R sonarqube:sonarqube /opt/sonarqube
 chmod -R 755 /opt/sonarqube