diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index 7f45a52..7b19568 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -564,6 +564,8 @@ class Env:
             elif self.distro == "ubuntu" and self.version in (
                 "23.10",
                 "mantic",
+                "24.04",
+                "noble",
             ):
                 install_deps = (
                     DOCKERFILE_UBUNTU_REM_USER + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
@@ -650,6 +652,8 @@ class Env:
             elif self.distro == "ubuntu" and self.version in (
                 "23.10",
                 "mantic",
+                "24.04",
+                "noble",
             ):
                 install_deps = DOCKERFILE_UBUNTU_REM_USER + DOCKERFILE_BUILD_DEBIAN_DEPS
             package = f"dangerzone_{version}-1_all.deb"
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 74a2397..28f6014 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -902,6 +902,11 @@ class QAUbuntu2310(QADebianBased):
     VERSION = "23.10"
 
 
+class QAUbuntu2404(QADebianBased):
+    DISTRO = "ubuntu"
+    VERSION = "24.04"
+
+
 class QAFedora(QALinux):
     """Base class for Fedora distros.
 
@@ -919,6 +924,10 @@ class QAFedora(QALinux):
         )
 
 
+class QAFedora40(QAFedora):
+    VERSION = "40"
+
+
 class QAFedora39(QAFedora):
     VERSION = "39"