diff --git a/docs/development_environment/introduction.md b/docs/development_environment/introduction.md
index d455364..01a63c7 100644
--- a/docs/development_environment/introduction.md
+++ b/docs/development_environment/introduction.md
@@ -3,11 +3,11 @@
 This reference integration supports [Visual Studio Code](https://code.visualstudio.com/)
 development environment with the help of [devcontainers](https://code.visualstudio.com/docs/devcontainers/containers)
 and [Docker](https://docs.docker.com/get-started/overview). With Visual Studio
-Code, Linux (Ubuntu 20.04), Windows 11 and Mac OS 14.x operating systems are
+Code, Linux (Ubuntu 22.04), Windows 11 and Mac OS 14.x operating systems are
 supported. Follow the steps described in the [document](./vscode_dev_env_build_and_debug.md)
 to setup Visual Stuido Code development environment.
 
 If you prefer not to use either Visual Stuido Code or Docker, then only
-Linux (Ubuntu 20.04) is supported as development environment. Follow the steps
+Linux (Ubuntu 22.04) is supported as development environment. Follow the steps
 described in the [document](./linux_dev_env.md)
-to setup Linux (Ubuntu 20.04) development environment.
+to setup Linux (Ubuntu 22.04) development environment.
diff --git a/docs/development_environment/vscode_dev_env_build_and_debug.md b/docs/development_environment/vscode_dev_env_build_and_debug.md
index 1aa3279..dfc24cf 100644
--- a/docs/development_environment/vscode_dev_env_build_and_debug.md
+++ b/docs/development_environment/vscode_dev_env_build_and_debug.md
@@ -19,7 +19,7 @@ improve the user experience of developing of reference applications.
 ## Supported operation systems
 
 * Linux
-  * Ubuntu 20.04
+  * Ubuntu 22.04
 * Windows 11
 * Mac OS 14.x
 
diff --git a/release_changes/202501231700.change.md b/release_changes/202501231700.change.md
new file mode 100644
index 0000000..a194b4d
--- /dev/null
+++ b/release_changes/202501231700.change.md
@@ -0,0 +1 @@
+ubuntu: Adapt to ubuntu v22.04 docker image changes.
diff --git a/tools/ci/pyproject.toml b/tools/ci/pyproject.toml
index fa06b3f..08d2a94 100644
--- a/tools/ci/pyproject.toml
+++ b/tools/ci/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
+requires = ["setuptools>=61", "wheel", "setuptools_scm[toml]>=3.4"]
 build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 local_scheme = "no-local-version"
diff --git a/tools/ci/setup.cfg b/tools/ci/setup.cfg
index e9feb40..90c6459 100644
--- a/tools/ci/setup.cfg
+++ b/tools/ci/setup.cfg
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Arm Limited and/or its affiliates
+# Copyright 2022-2025 Arm Limited and/or its affiliates
 # <open-source-office@arm.com>
 # SPDX-License-Identifier: MIT
 
@@ -8,7 +8,7 @@ description = Featured FreeRTOS IoT Integration targeting an Arm Corstone-3xx pl
 long_description = file: README.md
 long_description_content_type = text/markdown
 license = MIT
-license_file = LICENSE
+license_files = ['LICENSE']
 
 [options]
 packages = find:
diff --git a/tools/scripts/run_uncrustify.sh b/tools/scripts/run_uncrustify.sh
index d445b4d..ada1942 100755
--- a/tools/scripts/run_uncrustify.sh
+++ b/tools/scripts/run_uncrustify.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2023-2024 Arm Limited and/or its affiliates
+# Copyright 2023-2025 Arm Limited and/or its affiliates
 # <open-source-office@arm.com>
 # SPDX-License-Identifier: MIT
 
@@ -22,3 +22,8 @@ done
 exclude_pattern+="./build"
 
 fdfind -E $exclude_pattern -e c -e h -e cc -e cpp --exec uncrustify --no-backup --replace --if-changed -c tools/uncrustify.cfg
+# Uncrustify has a known problem where it does not keep track of braces that span multiple preprocessor blocks and therefore will
+# abort and complain about missing braces in code leading to returning an error which is not correct. We use git diff to check if
+# any files are changed after uncrustify runs, where this will return `1` (error) if any files were altered by uncrustify or `0`
+# otherwise.
+git diff --exit-code