diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f41c2a97..c2b3c3c1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,4 +90,4 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
           sudo apt install -y devscripts dh-python equivs python3-sphinx
-          ./scripts/build-using-ppa ${PWD}/build jammy
+          ./scripts/build-using-ppa ${PWD}/build noble
diff --git a/kas/common/base.yml b/kas/common/base.yml
index 3fb1b572..8a156642 100644
--- a/kas/common/base.yml
+++ b/kas/common/base.yml
@@ -21,7 +21,7 @@ repos:
       meta-isar:
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 740bbf9be9f15ec46ef27f5a220b2365ee0b2f3c
+    commit: bb5af4f9fc202c66584f38066681b36eaca7edcd
     layers:
       meta:
       meta-isar:
diff --git a/kas/ubuntu/mtda-qemu-amd64.yml b/kas/ubuntu/mtda-qemu-amd64.yml
index 8f54d677..c073a07f 100644
--- a/kas/ubuntu/mtda-qemu-amd64.yml
+++ b/kas/ubuntu/mtda-qemu-amd64.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------
-# Ubuntu focal image to run MTDA on x86_64
+# Ubuntu noble image to run MTDA on x86_64
 # ---------------------------------------------------------------------------
 #
 # This software is a part of MTDA.
@@ -17,4 +17,4 @@ header:
     - kas/common/base.yml
 
 machine: qemuamd64
-distro: ubuntu-jammy
+distro: ubuntu-noble
diff --git a/meta-isar/conf/multiconfig/ubuntu-qemu-amd64.conf b/meta-isar/conf/multiconfig/ubuntu-qemu-amd64.conf
index f7cdcc1a..93db845e 100644
--- a/meta-isar/conf/multiconfig/ubuntu-qemu-amd64.conf
+++ b/meta-isar/conf/multiconfig/ubuntu-qemu-amd64.conf
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: MIT
 # ---------------------------------------------------------------------------
 
-DISTRO = "ubuntu-jammy"
+DISTRO = "ubuntu-noble"
 MACHINE = "qemuamd64"
diff --git a/meta-isar/recipes-core/images/mtda-image.bb b/meta-isar/recipes-core/images/mtda-image.bb
index 49028244..45f188f1 100644
--- a/meta-isar/recipes-core/images/mtda-image.bb
+++ b/meta-isar/recipes-core/images/mtda-image.bb
@@ -62,6 +62,8 @@ IMAGE_PREINSTALL += "                    \
     python3-libgpiod                     \
 "
 
+IMAGE_PREINSTALL:remove:ubuntu-noble = "pdudaemon-client"
+
 # HomeKit support
 IMAGE_INSTALL += "python3-hap-python"
 
diff --git a/tox.ini b/tox.ini
index 73d10992..00ab5a0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------------------
 
 [tox]
-envlist = py38,py39,py310
+envlist = py38,py39,py310,py311
 
 [testenv]
 allowlist_externals = bash