diff --git a/.github/docker/build-ubuntu.Dockerfile b/.github/docker/build-ubuntu.Dockerfile
index 24f37aa8..74390f6e 100644
--- a/.github/docker/build-ubuntu.Dockerfile
+++ b/.github/docker/build-ubuntu.Dockerfile
@@ -18,14 +18,14 @@ FROM base AS branch-version-focal_20_04
 RUN echo "this is the stage that sets VAR=FALSE"
 ENV VAR=FALSE
 
+FROM base AS branch-version-22.04
+
 FROM branch-version-${IMAGE_VERSION} AS final
 RUN echo "Eoan is requested is equal to ${VAR}"
 
 RUN apt-get update && apt-get install -y \
         build-essential \
         ccache \
-        clang-format-7 \
-        clang-tidy \
         cmake \
         curl \
         git \
diff --git a/.github/workflows/ci-internal.yml b/.github/workflows/ci-internal.yml
index ad253b7f..8df50760 100644
--- a/.github/workflows/ci-internal.yml
+++ b/.github/workflows/ci-internal.yml
@@ -49,6 +49,10 @@ jobs:
             BUILD_PLATFORM_VERSION: ubuntu_20
             DISTRO: ubuntu
             BUILD_IMAGE_DOCKERFILE_IMAGE_VERSION: focal_20_04
+          - BUILD_PLATFORM: ubuntu-22.04
+            BUILD_PLATFORM_VERSION: ubuntu_22_04
+            DISTRO: ubuntu
+            BUILD_IMAGE_DOCKERFILE_IMAGE_VERSION: 22.04
           - BUILD_PLATFORM: ubuntu_arm64
             BUILD_PLATFORM_VERSION: ubuntu_arm64
             DISTRO: ubuntu_arm64