diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index 7f439d4fb..29b7e6097 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -149,6 +149,6 @@ packages: {
 
   # Default gcc/g++ package is 11.
   ubuntu2204: [
-    'gcc,g++,python3,python-is-python3',
+    'gcc,g++,gcc-12,g++-12,python3,python-is-python3',
   ],
 }
diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
index 28b043bb9..2d71afd8d 100644
--- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
       ccache \
       g++ \
       gcc \
+      g++-12 \
+      gcc-12 \
       git \
       openjdk-17-jre-headless \
       pkg-config \