diff --git a/Dockerfile b/Dockerfile
index 4a70ee0..5204a50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.6_10-jdk as cruisecontrol
+FROM eclipse-temurin:17.0.7_7-jdk as cruisecontrol
 ARG CRUISE_CONTROL_VERSION
 WORKDIR /
 USER root
@@ -21,7 +21,7 @@ RUN \
   && mv -v /cruise-control/cruise-control/build/dependant-libs/cruise-control-metrics-reporter-*.jar \
     /cruise-control/cruise-control/build/dependant-libs/cruise-control-metrics-reporter.jar
 
-FROM node:18.14-buster as cruisecontrol-ui
+FROM node:20.3.1-buster as cruisecontrol-ui
 ARG CRUISE_CONTROL_UI_GIT_REF
 WORKDIR /
 RUN \
@@ -34,7 +34,7 @@ RUN \
   && npm install \
   && npm run build
 
-FROM eclipse-temurin:17.0.6_10-jre
+FROM eclipse-temurin:17.0.7_7-jre
 ENV CRUISE_CONTROL_LIBS="/var/lib/cruise-control-ext-libs/*"
 ENV CLASSPATH="${CRUISE_CONTROL_LIBS}"
 RUN \
diff --git a/Makefile b/Makefile
index ecf9a3f..a6358f7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SHELL = /usr/bin/env bash -o pipefail
 
 CI ?= false
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-CRUISE_CONTROL_VERSION ?= 2.5.113
+CRUISE_CONTROL_VERSION ?= 2.5.123
 CRUISE_CONTROL_UI_GIT_REF ?= b1208a6f020c21ff967297814c2e893eed3f3183
 DOCKER_COMPOSE_PROJECT_NAME := "docker-cruise-control"
 DOCKER_COMPOSE_PROJECT_DIR := "./deploy"
diff --git a/test.sh b/test.sh
index 7dfe1fd..15a209f 100755
--- a/test.sh
+++ b/test.sh
@@ -6,7 +6,7 @@ readonly CRUISE_CONTROL_IMAGE="${CRUISE_CONTROL_IMAGE:?'Cruise Control image mus
 readonly DOCKER_COMPOSE_PROJECT_NAME="${DOCKER_COMPOSE_PROJECT_NAME:-docker-cruise-control-test}"
 readonly DOCKER_COMPOSE_PROJECT_DIR="${DOCKER_COMPOSE_PROJECT_DIR:-./deploy}"
 readonly USE_EXISTING="${USE_EXISTING:-false}"
-readonly TIMEOUT=120
+readonly TIMEOUT=220
 readonly CRUISE_CONTROL_CONTAINER_NAME="cruisecontrol"
 
 readonly STATUS_QUERY='[[.AnalyzerState.isProposalReady,