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..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 6cd2f1126..f4f2a7e74 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