diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bf80a2c2da7f8f1a274c185184276de924c0d76..00679e5769a6605b2649166f8f7385a43a85f2d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   FF_ENABLE_JOB_CLEANUP: 1
   GIT_STRATEGY: clone
-  # uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-17
-  BUILDER_IMAGE_TAG: "@sha256:234d3592e53d4cd7cc6df8e61366e8cbe69ac439355475c34fb2b0daf40e7a26"
+  # uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu22.04-18
+  BUILDER_IMAGE_TAG: "@sha256:3f3198e1db9e438ccfa1a559f7529a173129b74e74ae35e1c189f8820361c397"
   CI_DEBUG_SERVICES: "true"
   SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts"
   TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60
diff --git a/Dockerfile b/Dockerfile
index 612e0455b99044c8f6852081c2a94f70c76a7a85..192a6af6b6bd1f1be65bb327fcc814a3d7f3d04d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # docker buildx build --progress=plain --target=ci-base-image --tag registry.gitlab.syncad.com/hive/haf/ci-base-image$CI_IMAGE_TAG --file Dockerfile .
 # To be started from cloned haf source directory.
 ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/
-ARG CI_IMAGE_TAG=ubuntu22.04-17
+ARG CI_IMAGE_TAG=ubuntu22.04-18
 
 ARG BUILD_IMAGE_TAG
 ARG IMAGE_TAG_PREFIX
@@ -208,9 +208,9 @@ EXPOSE ${WS_PORT}
 # JSON rpc service
 EXPOSE ${HTTP_PORT}
 
-FROM registry.gitlab.syncad.com/hive/haf/minimal-runtime:ubuntu22.04-16 AS minimal-instance
+FROM registry.gitlab.syncad.com/hive/haf/minimal-runtime:ubuntu22.04-18 AS minimal-instance
 
-ENV BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG:-:ubuntu22.04-8}
+ENV BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG:-:ubuntu22.04-18}
 
 ARG P2P_PORT=2001
 ENV P2P_PORT=${P2P_PORT}
diff --git a/scripts/ci-helpers/build_ci_base_image.sh b/scripts/ci-helpers/build_ci_base_image.sh
index 21f631d0727093ecba0ed63f69208f20e93c87f1..4860d3ceab76bb8070899b42b76c1eade8e28bb8 100755
--- a/scripts/ci-helpers/build_ci_base_image.sh
+++ b/scripts/ci-helpers/build_ci_base_image.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 REGISTRY=${1:-registry.gitlab.syncad.com/hive/haf/}
-CI_IMAGE_TAG=ubuntu22.04-17
+CI_IMAGE_TAG=ubuntu22.04-18
 
 # exit when any command fails
 set -e