diff --git a/Makefile b/Makefile
index 0835e2e2..280ea9d4 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ include common/packages.mk
 
 GHA_MATRIX ?= minimal
 ifeq ($(GHA_MATRIX),minimal)
-	GHA_RELEASES := debian11 debian12 debian13 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static
+	GHA_RELEASES := debian11 debian12 debian13 ubuntu2204 ubuntu2404 centos9 oraclelinux9 fedora39 static
 else ifeq ($(GHA_MATRIX),all)
 	GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static
 else
diff --git a/common/packages.hcl b/common/packages.hcl
index e5b14ca1..5e0c11ce 100644
--- a/common/packages.hcl
+++ b/common/packages.hcl
@@ -119,25 +119,25 @@ target "_pkg-raspbian12" {
   }
 }
 
-target "_pkg-ubuntu2004" {
+target "_pkg-ubuntu2204" {
   args = {
-    PKG_RELEASE = "ubuntu2004"
+    PKG_RELEASE = "ubuntu2204"
     PKG_TYPE = "deb"
     PKG_DISTRO = "ubuntu"
-    PKG_DISTRO_ID = "20.04"
-    PKG_DISTRO_SUITE = "focal"
-    PKG_BASE_IMAGE = "ubuntu:focal"
+    PKG_DISTRO_ID = "22.04"
+    PKG_DISTRO_SUITE = "jammy"
+    PKG_BASE_IMAGE = "ubuntu:jammy"
   }
 }
 
-target "_pkg-ubuntu2204" {
+target "_pkg-ubuntu2404" {
   args = {
-    PKG_RELEASE = "ubuntu2204"
+    PKG_RELEASE = "ubuntu2404"
     PKG_TYPE = "deb"
     PKG_DISTRO = "ubuntu"
-    PKG_DISTRO_ID = "22.04"
-    PKG_DISTRO_SUITE = "jammy"
-    PKG_BASE_IMAGE = "ubuntu:jammy"
+    PKG_DISTRO_ID = "24.04"
+    PKG_DISTRO_SUITE = "noble"
+    PKG_BASE_IMAGE = "ubuntu:noble"
   }
 }
 
diff --git a/common/packages.mk b/common/packages.mk
index d7b626dd..4e53c31e 100644
--- a/common/packages.mk
+++ b/common/packages.mk
@@ -15,7 +15,7 @@
 # don't forget to add/update pkg-info-* rule and update packages.hcl as well
 # if you add a new release
 PKG_APK_RELEASES ?= alpine314 alpine315 alpine316
-PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2004 ubuntu2204 raspbian11 raspbian12
+PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
@@ -109,16 +109,6 @@ pkg-info-raspbian12:
 	$(eval PKG_BASE_IMAGE = balenalib/rpi-raspbian:bookworm)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/arm/v7)
 
-.PHONY: pkg-info-ubuntu2004
-pkg-info-ubuntu2004:
-	$(eval PKG_TYPE = deb)
-	$(eval PKG_DISTRO = ubuntu)
-	$(eval PKG_DISTRO_ID = 20.04)
-	$(eval PKG_DISTRO_SUITE = focal)
-	$(eval PKG_BASE_IMAGE = ubuntu:focal)
-	@# FIXME: linux/riscv64 is not supported (golang base image does not support riscv64)
-	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/s390x)
-
 .PHONY: pkg-info-ubuntu2204
 pkg-info-ubuntu2204:
 	$(eval PKG_TYPE = deb)
@@ -129,6 +119,15 @@ pkg-info-ubuntu2204:
 	@# FIXME: linux/riscv64 is not supported (golang base image does not support riscv64)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/s390x)
 
+.PHONY: pkg-info-ubuntu2404
+pkg-info-ubuntu2404:
+	$(eval PKG_TYPE = deb)
+	$(eval PKG_DISTRO = ubuntu)
+	$(eval PKG_DISTRO_ID = 24.04)
+	$(eval PKG_DISTRO_SUITE = noble)
+	$(eval PKG_BASE_IMAGE = ubuntu:noble)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/riscv64 linux/s390x)
+
 .PHONY: pkg-info-centos9
 pkg-info-centos9:
 	$(eval PKG_TYPE = rpm)
diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile
index a697809e..75ab5423 100644
--- a/pkg/docker-cli/Dockerfile
+++ b/pkg/docker-cli/Dockerfile
@@ -97,7 +97,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$PKG_RELEASE" in
-    ubuntu2004|ubuntu2204)
+    ubuntu2204|ubuntu2404)
       if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
         rm -f /usr/bin/man
         dpkg-divert --quiet --remove --rename /usr/bin/man
diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
index 90e107d4..0277e6ae 100644
--- a/pkg/docker-engine/Dockerfile
+++ b/pkg/docker-engine/Dockerfile
@@ -96,7 +96,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$PKG_RELEASE" in
-    ubuntu2004|ubuntu2204)
+    ubuntu2204|ubuntu2404)
       if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
         rm -f /usr/bin/man
         dpkg-divert --quiet --remove --rename /usr/bin/man