diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 917dbf5..e610c07 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -64,6 +64,10 @@ jobs:
             dockerfile: 'ubuntu/22.04.Dockerfile'
             platforms: 'linux/amd64,linux/arm64'
 
+          - tag: 'ubuntu-24.04'
+            dockerfile: 'ubuntu/24.04.Dockerfile'
+            platforms: 'linux/amd64,linux/arm64'
+
     steps:
       - name: 'Checkout the codebase'
         uses: 'actions/checkout@v4'
diff --git a/README.md b/README.md
index 517d208..55c6fd5 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ Ubuntu:
 - `ubuntu-18.04` (`linux/amd64`,`linux/arm64`)
 - `ubuntu-20.04` (`linux/amd64`,`linux/arm64`)
 - `ubuntu-22.04` (`linux/amd64`,`linux/arm64`)
+- `ubuntu-24.04` (`linux/amd64`,`linux/arm64`)
 
 ## Usage
 
diff --git a/ubuntu/24.04.Dockerfile b/ubuntu/24.04.Dockerfile
new file mode 100644
index 0000000..0e8b330
--- /dev/null
+++ b/ubuntu/24.04.Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:24.04
+
+LABEL maintainer='Anton Melekhin'
+
+ENV container=docker \
+    DEBIAN_FRONTEND=noninteractive
+
+RUN INSTALL_PKGS='findutils iproute2 python3 python3-apt sudo systemd' \
+    && apt-get update && apt-get install $INSTALL_PKGS -y --no-install-recommends \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN find /etc/systemd/system \
+    /lib/systemd/system \
+    -path '*.wants/*' \
+    -not -name '*journald*' \
+    -not -name '*systemd-tmpfiles*' \
+    -not -name '*systemd-user-sessions*' \
+    -print0 | xargs -0 rm -vf
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+ENTRYPOINT [ "/lib/systemd/systemd" ]
\ No newline at end of file