diff --git a/.github/workflows/dockerx_ubuntu.yml b/.github/workflows/dockerx_ubuntu.yml
index fe7db8a..5396c5d 100644
--- a/.github/workflows/dockerx_ubuntu.yml
+++ b/.github/workflows/dockerx_ubuntu.yml
@@ -21,12 +21,14 @@ jobs:
           - { dockerfile: "ubuntu/Dockerfile.bionic", context: "ubuntu", image_name: "ubuntu", tag_name: "bionic" }
           - { dockerfile: "ubuntu/Dockerfile.focal", context: "ubuntu", image_name: "ubuntu", tag_name: "focal" }
           - { dockerfile: "ubuntu/Dockerfile.jammy", context: "ubuntu", image_name: "ubuntu", tag_name: "jammy" }
+          - { dockerfile: "ubuntu/Dockerfile.noble", context: "ubuntu", image_name: "ubuntu", tag_name: "noble" }
           - { dockerfile: "ubuntu_dev/Dockerfile", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "latest" }
           - { dockerfile: "ubuntu_dev/Dockerfile.rolling", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "rolling" }
           - { dockerfile: "ubuntu_dev/Dockerfile.xenial", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "xenial" }
           - { dockerfile: "ubuntu_dev/Dockerfile.bionic", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "bionic" }
           - { dockerfile: "ubuntu_dev/Dockerfile.focal", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "focal" }
           - { dockerfile: "ubuntu_dev/Dockerfile.jammy", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "jammy" }
+          - { dockerfile: "ubuntu_dev/Dockerfile.noble", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "noble" }
     runs-on: self-hosted
     steps:
       - name: Checkout code
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index d2744ad..ba78cb7 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:jammy
 
 LABEL version="1.0"
 LABEL maintainer="Hive Solutions <development@hive.pt>"
diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble
new file mode 100644
index 0000000..218f097
--- /dev/null
+++ b/ubuntu/Dockerfile.noble
@@ -0,0 +1,15 @@
+FROM ubuntu:noble
+
+LABEL version="1.0"
+LABEL maintainer="Hive Solutions <development@hive.pt>"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update &&\
+    apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\
+    apt-get clean && rm -rf /var/lib/apt/lists/* &&\
+    wget "https://bootstrap.pypa.io/get-pip.py" &&\
+    python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\
+    rm get-pip.py
+
+CMD ["/bin/bash"]
diff --git a/ubuntu/Dockerfile.rolling b/ubuntu/Dockerfile.rolling
index bbcd2b1..c0ca409 100644
--- a/ubuntu/Dockerfile.rolling
+++ b/ubuntu/Dockerfile.rolling
@@ -6,11 +6,10 @@ LABEL maintainer="Hive Solutions <development@hive.pt>"
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update &&\
-    apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\
+    apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* &&\
-    rm /usr/lib/python3.11/EXTERNALLY-MANAGED &&\
     wget "https://bootstrap.pypa.io/get-pip.py" &&\
-    python3 get-pip.py --no-cache-dir --no-compile &&\
+    python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\
     rm get-pip.py
 
 CMD ["/bin/bash"]
diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble
new file mode 100644
index 0000000..58890d7
--- /dev/null
+++ b/ubuntu_dev/Dockerfile.noble
@@ -0,0 +1,13 @@
+FROM hivesolutions/ubuntu:noble
+
+LABEL version="1.0"
+LABEL maintainer="Hive Solutions <development@hive.pt>"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update &&\
+    apt-get install -y -q --no-install-recommends sudo gcc make curl pypy3 linux-headers-generic\
+    libssl-dev python3-dev pypy3-dev &&\
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+CMD ["/bin/bash"]