diff --git a/.env b/.env
index ea7751f74..b030125c9 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-FAABRIC_VERSION=0.20.0
-FAABRIC_CLI_IMAGE=ghcr.io/faasm/faabric:0.20.0
+FAABRIC_VERSION=0.21.0
+FAABRIC_CLI_IMAGE=ghcr.io/faasm/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 16ecf1cfd..957965d0d 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: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/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: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/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: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/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: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/faabric:0.21.0
       options: --privileged
     services:
       redis:
@@ -104,7 +104,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/faabric:0.21.0
       options: --privileged
     services:
       redis:
@@ -156,7 +156,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: ghcr.io/faasm/faabric:0.20.0
+      image: ghcr.io/faasm/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-compose.yml b/docker-compose.yml
index 9fbb1e294..1959305a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   redis:
     image: redis
diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile
index 5b1637653..2be4e1238 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
diff --git a/docker/faabric.dockerfile b/docker/faabric.dockerfile
index 6d312271e..990cf8640 100644
--- a/docker/faabric.dockerfile
+++ b/docker/faabric.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/faasm/faabric-base:0.15.0
+FROM ghcr.io/faasm/faabric-base:0.21.0
 ARG FAABRIC_VERSION
 
 # faabic-base image is not re-built often, so tag may be behind
diff --git a/docker/planner.dockerfile b/docker/planner.dockerfile
index 9a30b5d8f..02f3e92fc 100644
--- a/docker/planner.dockerfile
+++ b/docker/planner.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/faasm/faabric-base:0.15.0
+FROM ghcr.io/faasm/faabric-base:0.21.0
 ARG FAABRIC_VERSION
 
 # Flag to say we're in a container
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>