diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc82aa60afcd21494753836f0040a41237dab07..a72823a1d07992e6cc2786a9fa84b00e5fdb3dd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
   FF_ENABLE_JOB_CLEANUP: 1
   GIT_STRATEGY: clone
   # uses registry.gitlab.syncad.com/hive/haf/ci-base-image:ubuntu24.04-1
-  BUILDER_IMAGE_TAG: "@sha256:a3793dfccca6762c33adf819588960ea45463bf00be2ba61d8040260c3e648b1"
+  BUILDER_IMAGE_TAG: "@sha256:fc149082a4ee91ed622a14d283ae7fe44d13b123f2927d2e71a2167bbe63fab0"
   CI_DEBUG_SERVICES: "true"
   SETUP_SCRIPTS_PATH: "$CI_PROJECT_DIR/scripts"
   TEST_TOOLS_NODE_DEFAULT_WAIT_FOR_LIVE_TIMEOUT: 60
diff --git a/src/query_supervisor/configuration.cpp b/src/query_supervisor/configuration.cpp
index ed68cc077b69300c7299d8b3e33de41c217f6fb4..c75c81d2efe500199f46b859220988bfd8bf72de 100644
--- a/src/query_supervisor/configuration.cpp
+++ b/src/query_supervisor/configuration.cpp
@@ -1,9 +1,9 @@
+#include <boost/algorithm/string.hpp>
+
 #include "configuration.hpp"
 
 #include "psql_utils/logger.hpp"
 
-#include <boost/algorithm/string.hpp>
-
 #include <cassert>
 
 namespace PsqlTools::QuerySupervisor {
diff --git a/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp b/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
index 7d8c079c53ce73266bdf3a9a9b2eea0c54712cbc..86deadb4b134c10628343c241209819a682189b6 100644
--- a/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
+++ b/src/sql_serializer/include/hive/plugins/sql_serializer/write_ahead_log.hpp
@@ -5,6 +5,7 @@
 #include <optional>
 #include <deque>
 #include <atomic>
+#include <fstream>
 
 namespace hive::plugins::sql_serializer {
   namespace bfs = boost::filesystem;
diff --git a/tests/integration/state_provider/state_provider_common_run.sh b/tests/integration/state_provider/state_provider_common_run.sh
index ccd602a4baab82fb0b3d3b13a1f4e1b43aeb4bb9..26b66f066c9f0b1dad142acd589c631ce2e30540 100755
--- a/tests/integration/state_provider/state_provider_common_run.sh
+++ b/tests/integration/state_provider/state_provider_common_run.sh
@@ -32,19 +32,19 @@ psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "SELECT hive.app_create_
 psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "SELECT hive.app_state_provider_import('${TYPE}', '${NAME}_live');"
 
 echo "Replay of ${NAME}..."
-psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "CALL ${NAME}_live.main('${NAME}_live', 0, 5000000, 500000);" 
+psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "CALL ${NAME}_live.main('${NAME}_live', 0, 5000000, 500000);"
 
 echo "Clearing tables..."
 psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.${TABLE_NAME};"
 psql -w -d $DB_NAME -v ON_ERROR_STOP=on -U $DB_ADMIN -c "TRUNCATE ${NAME}_live.differing_accounts;"
 
 echo "Installing dependencies..."
-pip install psycopg2-binary
+pip install --break-system-packages psycopg2-binary
 
 rm -f "${CURRENT_PROJECT_DIR}/account_data/accounts_dump.json"
 # The line below is somewhat problematic. Gunzip by default deletes gz file after decompression,
 # but the '-k' parameter, which prevents that from happening is not supported on some of its versions.
-# 
+#
 # Thus, depending on the OS, the line below may need to be replaced with one of the following:
 # gunzip -c "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"
 # gzcat "${SCRIPTDIR}/accounts_dump.json.gz" > "${SCRIPTDIR}/accounts_dump.json"