diff --git a/.env b/.env
index 3c1d9e416..df671b279 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-FAABRIC_VERSION=0.20.0
-FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.20.0
+FAABRIC_VERSION=0.21.0
+FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.21.0
 COMPOSE_PROJECT_NAME=faabric-dev
 CONAN_CACHE_MOUNT_SOURCE=./conan-cache/
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c1d4d1bb6..5be950b12 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
     env:
       DEPLOYMENT_TYPE: gha-ci
     steps:
@@ -34,7 +34,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
       options: --privileged
     services:
       redis:
@@ -104,7 +104,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
       options: --privileged
     services:
       redis:
@@ -156,7 +156,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm.azurecr.io/faabric:0.20.0
+      image: faasm.azurecr.io/faabric:0.21.0
     services:
       redis:
         image: redis
diff --git a/VERSION b/VERSION
index 5a03fb737..885415662 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.20.0
+0.21.0
diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile
index 5b1637653..8e7474107 100644
--- a/docker/faabric-base.dockerfile
+++ b/docker/faabric-base.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # Configure APT repositories
 ARG LLVM_VERSION_MAJOR
@@ -11,7 +11,7 @@ RUN apt update \
         wget \
     # LLVM APT Repo config
     && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
-    && add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION_MAJOR} main"
+    && add-apt-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-${LLVM_VERSION_MAJOR} main"
 
 # Install APT packages
 RUN apt update && apt install -y \
diff --git a/docker/faabric.dockerfile b/docker/faabric.dockerfile
index 6cd2f1126..504c84abd 100644
--- a/docker/faabric.dockerfile
+++ b/docker/faabric.dockerfile
@@ -1,4 +1,4 @@
-FROM faasm.azurecr.io/faabric-base:0.15.0
+FROM faasm.azurecr.io/faabric-base:0.21.0
 ARG FAABRIC_VERSION
 
 # faabic-base image is not re-built often, so tag may be behind
@@ -30,7 +30,7 @@ RUN ./bin/create_venv.sh \
 RUN echo "set auto-load safe-path /" > /root/.gdbinit
 
 # CLI setup
-ENV TERM xterm-256color
+ENV TERM=xterm-256color
 
 RUN echo ". /code/faabric/bin/workon.sh" >> ~/.bashrc
 CMD ["/bin/bash", "-l"]
diff --git a/include/faabric/util/bytes.h b/include/faabric/util/bytes.h
index c6c051dae..822f85dd5 100644
--- a/include/faabric/util/bytes.h
+++ b/include/faabric/util/bytes.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cstdint>
 #include <iomanip>
 #include <list>
 #include <span>
diff --git a/include/faabric/util/files.h b/include/faabric/util/files.h
index d978a4c07..2c8216bdb 100644
--- a/include/faabric/util/files.h
+++ b/include/faabric/util/files.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <faabric/util/exception.h>
 #include <string>
 #include <vector>
diff --git a/src/planner/Planner.cpp b/src/planner/Planner.cpp
index 996dd3430..c66459add 100644
--- a/src/planner/Planner.cpp
+++ b/src/planner/Planner.cpp
@@ -120,6 +120,7 @@ static void releaseHostMpiPort(std::shared_ptr<Host> host, int mpiPort)
     throw std::runtime_error("Requested to free unavailable MPI port!");
 }
 
+#ifndef NDEBUG
 static void printHostState(std::map<std::string, std::shared_ptr<Host>> hostMap,
                            const std::string& logLevel = "debug")
 {
@@ -147,6 +148,7 @@ static void printHostState(std::map<std::string, std::shared_ptr<Host>> hostMap,
         SPDLOG_ERROR("Unrecognised log level: {}", logLevel);
     }
 }
+#endif
 
 // ----------------------
 // Planner