diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble
new file mode 100644
index 0000000..6ad771e
--- /dev/null
+++ b/ubuntu/Dockerfile.noble
@@ -0,0 +1,19 @@
+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 python2 python3 python3-distutils &&\
+    ln -s /usr/bin/python2 /usr/bin/python &&\
+    apt-get clean && rm -rf /var/lib/apt/lists/* &&\
+    wget "https://bootstrap.pypa.io/get-pip.py" &&\
+    wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\
+    python3 get-pip.py --no-cache-dir --no-compile &&\
+    python get-pip-2.py --no-cache-dir --no-compile &&\
+    rm get-pip.py &&\
+    rm get-pip-2.py
+
+CMD ["/bin/bash"]
diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble
new file mode 100644
index 0000000..3307f62
--- /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 pypy linux-headers-generic\
+    libssl-dev python2-dev python3-dev pypy-dev &&\
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+CMD ["/bin/bash"]