diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index d3168f60a3..a4e1ddea8b 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -298,7 +298,7 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu24'
+			self.dockerfileprefix = '.ubuntu'
 			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
@@ -337,7 +337,7 @@ class Containerize():
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
-			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+			self.dockerfileprefix = '.ubuntu.cross-arm64'
 		result = re.search('native_arm', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -625,7 +625,7 @@ class Containerize():
 			return False
 
 		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu24"
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu"
 		logfile = f'{lSourcePath}/cmake_targets/log/unittest-build.log'
 		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {logfile}')
 		archiveArtifact(cmd, ctx, logfile)
diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py
index 8b0ec05352..62e9416082 100644
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -212,7 +212,7 @@ class StaticCodeAnalysis():
 		logDir = f'{lSourcePath}/cmake_targets/log/'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
+		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.ubuntu {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
 
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')
diff --git a/ci-scripts/docker/Dockerfile.formatting.ubuntu24 b/ci-scripts/docker/Dockerfile.formatting.ubuntu
similarity index 100%
rename from ci-scripts/docker/Dockerfile.formatting.ubuntu24
rename to ci-scripts/docker/Dockerfile.formatting.ubuntu
diff --git a/ci-scripts/docker/Dockerfile.unittest.ubuntu24 b/ci-scripts/docker/Dockerfile.unittest.ubuntu
similarity index 100%
rename from ci-scripts/docker/Dockerfile.unittest.ubuntu24
rename to ci-scripts/docker/Dockerfile.unittest.ubuntu
diff --git a/ci-scripts/yaml_files/local_common_overrides/build_images.yaml b/ci-scripts/yaml_files/local_common_overrides/build_images.yaml
index a771289ae4..d738ccb2ff 100644
--- a/ci-scripts/yaml_files/local_common_overrides/build_images.yaml
+++ b/ci-scripts/yaml_files/local_common_overrides/build_images.yaml
@@ -3,7 +3,7 @@ services:
     image: ran-base
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.base.ubuntu22
+      dockerfile: docker/Dockerfile.base.ubuntu
       tags:
         - ran-base
 
@@ -11,7 +11,7 @@ services:
     image: ran-build
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.build.ubuntu22
+      dockerfile: docker/Dockerfile.build.ubuntu
       tags:
         - ran-build
     depends_on:
@@ -22,7 +22,7 @@ services:
     image: gnb-local
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.gNB.ubuntu22
+      dockerfile: docker/Dockerfile.gNB.ubuntu
       tags:
         - gnb-local
     depends_on:
@@ -35,7 +35,7 @@ services:
     image: ue-local
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.nrUE.ubuntu22
+      dockerfile: docker/Dockerfile.nrUE.ubuntu
       tags:
         - ue-local
     depends_on:
diff --git a/doc/Aerial_FAPI_Split_Tutorial.md b/doc/Aerial_FAPI_Split_Tutorial.md
index 1d8132e38d..4192a8689f 100644
--- a/doc/Aerial_FAPI_Split_Tutorial.md
+++ b/doc/Aerial_FAPI_Split_Tutorial.md
@@ -213,8 +213,8 @@ With the nvIPC sources in the project directory, the docker image can be built.
 In order to build the target image (`oai-gnb-aerial`), first you should build a common shared image (`ran-base`)
 ```bash
 ~$ cd ~/openairinterface5g/
-~/openairinterface5g$ docker build . -f docker/Dockerfile.base.ubuntu22 --tag ran-base:latest
-~/openairinterface5g$ docker build . -f docker/Dockerfile.gNB.aerial.ubuntu22 --tag oai-gnb-aerial:latest
+~/openairinterface5g$ docker build . -f docker/Dockerfile.base.ubuntu --tag ran-base:latest
+~/openairinterface5g$ docker build . -f docker/Dockerfile.gNB.aerial.ubuntu --tag oai-gnb-aerial:latest
 ```
 
 
diff --git a/doc/README.md b/doc/README.md
index 40f838750a..f3e30b57ce 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -138,4 +138,4 @@ The other SDRs (AW2S, LimeSDR, ...) have no READMEs.
 
 - [formatting](../tools/formatting/README.md) is a clang-format error detection tool
 - [iwyu](../tools/iwyu/README.md) is a tool to detect `#include` errors
-- [docker-dev-env](../tools/docker-dev-env/README.md) is a ubuntu22 docker development environment
+- [docker-dev-env](../tools/docker-dev-env/README.md) is a ubuntu24 docker development environment
diff --git a/doc/TESTBenches.md b/doc/TESTBenches.md
index 2e0a26b2f9..f6a77c2d09 100644
--- a/doc/TESTBenches.md
+++ b/doc/TESTBenches.md
@@ -88,8 +88,8 @@ information on how the images are built.
 - [RAN-ARM-Cross-Compile-Builder](https://jenkins-oai.eurecom.fr/job/RAN-ARM-Cross-Compile-Builder/)
   ~BUILD-ONLY ~4G-LTE ~5G-NR ~nrUE
   - orion: Cross-compilation from Intel to ARM
-  - base image from `Dockerfile.base.ubuntu22.cross-arm64`
-  - build image from `Dockerfile.build.ubuntu22.cross-arm64` (no target images)
+  - base image from `Dockerfile.base.ubuntu.cross-arm64`
+  - build image from `Dockerfile.build.ubuntu.cross-arm64` (no target images)
 - [RAN-cppcheck](https://jenkins-oai.eurecom.fr/job/RAN-cppcheck/)
   ~BUILD-ONLY ~4G-LTE ~5G-NR ~nrUE
   - bellatrix
@@ -112,29 +112,29 @@ information on how the images are built.
   - build image from `Dockerfile.clang.rhel9` (compilation only, artifacts not used currently)
 - [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
   ~BUILD-ONLY ~4G-LTE ~5G-NR ~nrUE
-  - run formatting check from `ci-scripts/docker/Dockerfile.formatting.bionic`
+  - run formatting check from `ci-scripts/docker/Dockerfile.formatting.ubuntu`
   - obelix: Ubuntu 22 image build using docker (Note: builds U22 images while pipeline is named U18!)
-  - base image from `Dockerfile.base.ubuntu22`
-  - build image from `Dockerfile.build.ubuntu22`, followed by
-    - target image from `Dockerfile.eNB.ubuntu22`
-    - target image from `Dockerfile.gNB.ubuntu22`
-    - target image from `Dockerfile.nr-cuup.ubuntu22`
-    - target image from `Dockerfile.nrUE.ubuntu22`
-    - target image from `Dockerfile.lteUE.ubuntu22`
-    - target image from `Dockerfile.lteRU.ubuntu22`
-    - target image from `Dockerfile.gNB.aerial.ubuntu22`
-  - build image from `Dockerfile.build.fhi72.ubuntu22`, followed by
-    - target image from `Dockerfile.gNB.fhi72.ubuntu22`
-  - build unit tests from `ci-scripts/docker/Dockerfile.unittest.ubuntu22`, and run them
+  - base image from `Dockerfile.base.ubuntu`
+  - build image from `Dockerfile.build.ubuntu`, followed by
+    - target image from `Dockerfile.eNB.ubuntu`
+    - target image from `Dockerfile.gNB.ubuntu`
+    - target image from `Dockerfile.nr-cuup.ubuntu`
+    - target image from `Dockerfile.nrUE.ubuntu`
+    - target image from `Dockerfile.lteUE.ubuntu`
+    - target image from `Dockerfile.lteRU.ubuntu`
+    - target image from `Dockerfile.gNB.aerial.ubuntu`
+  - build image from `Dockerfile.build.fhi72.ubuntu`, followed by
+    - target image from `Dockerfile.gNB.fhi72.ubuntu`
+  - build unit tests from `ci-scripts/docker/Dockerfile.unittest.ubuntu`, and run them
 - [RAN-Ubuntu-ARM-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-ARM-Image-Builder/)
   ~BUILD-ONLY ~4G-LTE ~5G-NR
   - gracehopper3-oai: ARM Ubuntu 22 image build using docker
-  - base image from `Dockerfile.base.ubuntu22`
-  - build image from `Dockerfile.build.ubuntu22`, followed by
-    - target image from `Dockerfile.gNB.ubuntu22`
-    - target image from `Dockerfile.nr-cuup.ubuntu22`
-    - target image from `Dockerfile.nrUE.ubuntu22`
-    - target image from `Dockerfile.gNB.aerial.ubuntu22`
+  - base image from `Dockerfile.base.ubuntu`
+  - build image from `Dockerfile.build.ubuntu`, followed by
+    - target image from `Dockerfile.gNB.ubuntu`
+    - target image from `Dockerfile.nr-cuup.ubuntu`
+    - target image from `Dockerfile.nrUE.ubuntu`
+    - target image from `Dockerfile.gNB.aerial.ubuntu`
 
 #### Image Test pipelines
 
diff --git a/doc/cross-compile.md b/doc/cross-compile.md
index ae8dbe5209..79c4bae761 100644
--- a/doc/cross-compile.md
+++ b/doc/cross-compile.md
@@ -97,5 +97,5 @@ ninja params_libconfig coding rfsimulator
 # Further information
 
 You can do the above steps using docker, see dockerfiles
-`docker/Dockerfile.base.ubuntu22.cross-arm64` and
-`docker/Dockerfile.build.ubuntu22.cross-arm64` for more information.
+`docker/Dockerfile.base.ubuntu.cross-arm64` and
+`docker/Dockerfile.build.ubuntu.cross-arm64` for more information.
diff --git a/docker/Dockerfile.base.ubuntu24 b/docker/Dockerfile.base.ubuntu
similarity index 100%
rename from docker/Dockerfile.base.ubuntu24
rename to docker/Dockerfile.base.ubuntu
diff --git a/docker/Dockerfile.base.ubuntu24.cross-arm64 b/docker/Dockerfile.base.ubuntu.cross-arm64
similarity index 100%
rename from docker/Dockerfile.base.ubuntu24.cross-arm64
rename to docker/Dockerfile.base.ubuntu.cross-arm64
diff --git a/docker/Dockerfile.build.fhi72.native_arm.ubuntu24 b/docker/Dockerfile.build.fhi72.native_arm.ubuntu
similarity index 100%
rename from docker/Dockerfile.build.fhi72.native_arm.ubuntu24
rename to docker/Dockerfile.build.fhi72.native_arm.ubuntu
diff --git a/docker/Dockerfile.build.fhi72.ubuntu24 b/docker/Dockerfile.build.fhi72.ubuntu
similarity index 100%
rename from docker/Dockerfile.build.fhi72.ubuntu24
rename to docker/Dockerfile.build.fhi72.ubuntu
diff --git a/docker/Dockerfile.build.ubuntu24 b/docker/Dockerfile.build.ubuntu
similarity index 100%
rename from docker/Dockerfile.build.ubuntu24
rename to docker/Dockerfile.build.ubuntu
diff --git a/docker/Dockerfile.build.ubuntu24.cross-arm64 b/docker/Dockerfile.build.ubuntu.cross-arm64
similarity index 100%
rename from docker/Dockerfile.build.ubuntu24.cross-arm64
rename to docker/Dockerfile.build.ubuntu.cross-arm64
diff --git a/docker/Dockerfile.eNB.ubuntu24 b/docker/Dockerfile.eNB.ubuntu
similarity index 100%
rename from docker/Dockerfile.eNB.ubuntu24
rename to docker/Dockerfile.eNB.ubuntu
diff --git a/docker/Dockerfile.gNB.aerial.ubuntu24 b/docker/Dockerfile.gNB.aerial.ubuntu
similarity index 100%
rename from docker/Dockerfile.gNB.aerial.ubuntu24
rename to docker/Dockerfile.gNB.aerial.ubuntu
diff --git a/docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address b/docker/Dockerfile.gNB.aerial.ubuntu.sanitize-address
similarity index 100%
rename from docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address
rename to docker/Dockerfile.gNB.aerial.ubuntu.sanitize-address
diff --git a/docker/Dockerfile.gNB.aw2s.ubuntu24 b/docker/Dockerfile.gNB.aw2s.ubuntu
similarity index 100%
rename from docker/Dockerfile.gNB.aw2s.ubuntu24
rename to docker/Dockerfile.gNB.aw2s.ubuntu
diff --git a/docker/Dockerfile.gNB.fhi72.ubuntu24 b/docker/Dockerfile.gNB.fhi72.ubuntu
similarity index 100%
rename from docker/Dockerfile.gNB.fhi72.ubuntu24
rename to docker/Dockerfile.gNB.fhi72.ubuntu
diff --git a/docker/Dockerfile.gNB.ubuntu24 b/docker/Dockerfile.gNB.ubuntu
similarity index 100%
rename from docker/Dockerfile.gNB.ubuntu24
rename to docker/Dockerfile.gNB.ubuntu
diff --git a/docker/Dockerfile.lteRU.ubuntu24 b/docker/Dockerfile.lteRU.ubuntu
similarity index 100%
rename from docker/Dockerfile.lteRU.ubuntu24
rename to docker/Dockerfile.lteRU.ubuntu
diff --git a/docker/Dockerfile.lteUE.ubuntu24 b/docker/Dockerfile.lteUE.ubuntu
similarity index 100%
rename from docker/Dockerfile.lteUE.ubuntu24
rename to docker/Dockerfile.lteUE.ubuntu
diff --git a/docker/Dockerfile.nr-cuup.ubuntu24 b/docker/Dockerfile.nr-cuup.ubuntu
similarity index 100%
rename from docker/Dockerfile.nr-cuup.ubuntu24
rename to docker/Dockerfile.nr-cuup.ubuntu
diff --git a/docker/Dockerfile.nrUE.ubuntu24 b/docker/Dockerfile.nrUE.ubuntu
similarity index 100%
rename from docker/Dockerfile.nrUE.ubuntu24
rename to docker/Dockerfile.nrUE.ubuntu
diff --git a/docker/README.md b/docker/README.md
index 36ec65698a..2249fb9c25 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -78,7 +78,7 @@ Targets can be:
 The currently-supported OS are:
 
 - `rhel9` for Red Hat Enterprise Linux and Openshift Universal Base Image
-- `ubuntu22` for Ubuntu 22.04 LTS
+- `ubuntu` for Ubuntu 24.04 LTS
 - `rocky` for Rocky-Linux 9
 
 For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md).
@@ -99,11 +99,11 @@ There are two shared images: one that has all dependencies, and a second that co
 git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
 cd openairinterface5g
 # default branch is develop, to change use git checkout <BRANCH>
-docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu22 .
+docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu .
 # if you want use USRP, AW2S and RFSimulator radios
-docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu22 .
+docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu .
 # if you want to use front-haul 7.2 and RFSimulator radios
-docker build --tag ran-build-fhi72:latest --file docker/Dockerfile.build.fhi72.ubuntu22 .
+docker build --tag ran-build-fhi72:latest --file docker/Dockerfile.build.fhi72.ubuntu .
 ```
 
 After building:
@@ -126,7 +126,7 @@ This is only available for the Ubuntu version of Dockerfiles.
 You can, for example, create a `sanitizer` version of the ran-build image.
 
 ```bash
-docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu22 --build-arg "BUILD_OPTION=--sanitize" .
+docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu --build-arg "BUILD_OPTION=--sanitize" .
 ```
 
 Currently the `--sanitize` option for `build_oai` enables:
@@ -152,13 +152,13 @@ You can also use this docker build arguments to pass any available option(s) on
 For example, the eNB:
 
 ```bash
-docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu22 .
+docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu .
 ```
 
 To build gNB/DU with 7.2 fronthaul support:
 
 ```bash
-docker build --target oai-gnb-fhi72 --tag oai-gnb-fhi72:latest --file docker/Dockerfile.gNB.fhi72.ubuntu22  .
+docker build --target oai-gnb-fhi72 --tag oai-gnb-fhi72:latest --file docker/Dockerfile.gNB.fhi72.ubuntu  .
 ```
 
 After a while:
@@ -182,7 +182,7 @@ Note that the steps are identical for `rocky-linux`.
 If you have used the sanitizer option, then you should also pass it when building the target image:
 
 ```bash
-docker build --target oai-gnb --tag oai-gnb:latest --file docker/Dockerfile.gNB.ubuntu22 --build-arg "BUILD_OPTION=--sanitize" .
+docker build --target oai-gnb --tag oai-gnb:latest --file docker/Dockerfile.gNB.ubuntu --build-arg "BUILD_OPTION=--sanitize" .
 ```
 
 Normally the target image will be around 200 Mbytes bigger.
diff --git a/tools/docker-dev-env/README.md b/tools/docker-dev-env/README.md
index 5dcb15eb5c..63bd598725 100644
--- a/tools/docker-dev-env/README.md
+++ b/tools/docker-dev-env/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-This contains bash scripts for managing a ubuntu22 dockerized development enviroment for OAI. No need to install any
+This contains bash scripts for managing a ubuntu24 dockerized development enviroment for OAI. No need to install any
 tools on host machines except for docker
 
  - `bootstrap.sh` - build development environment image and install the following bash aliases in `~/.bash_aliases`:
diff --git a/tools/docker-dev-env/bootstrap.sh b/tools/docker-dev-env/bootstrap.sh
index 8c21554dcf..e56be3fa91 100755
--- a/tools/docker-dev-env/bootstrap.sh
+++ b/tools/docker-dev-env/bootstrap.sh
@@ -11,7 +11,7 @@ fi
 
 if ! docker images | grep -q "ran-base"; then
     echo "ran-base:latest image not found. Building the image..."
-    docker build -f ../../docker/Dockerfile.base.ubuntu22 -t ran-base:latest ../../
+    docker build -f ../../docker/Dockerfile.base.ubuntu -t ran-base:latest ../../
 else
     echo "ran-base:latest image found."
 fi