diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 28093fa..1e0544d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         arch:
           - arch: amd64
-            runner: ubuntu-22.04
+            runner: ubuntu-24.04
           - arch: arm64
             runner: [self-hosted, linux, ARM64, medium, jammy]
     runs-on: ${{ matrix.arch.runner }}
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 87c316e..8db9f09 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         arch:
           - arch: amd64
-            runner: ubuntu-22.04
+            runner: ubuntu-24.04
           - arch: arm64
             runner: [self-hosted, linux, ARM64, medium, jammy]
     runs-on: ${{ matrix.arch.runner }}
diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
index 18d51bb..bacd829 100644
--- a/.github/workflows/promote.yaml
+++ b/.github/workflows/promote.yaml
@@ -46,5 +46,5 @@ jobs:
           destination-channel: latest/${{ env.promote-to }}
           origin-channel: latest/${{ env.promote-from }}
           charmcraft-channel: latest/stable
-          base-channel: "22.04"
+          base-channel: "24.04"
           base-architecture: ${{ github.event.inputs.arch }}
diff --git a/.github/workflows/publish-charm.yaml b/.github/workflows/publish-charm.yaml
index e9d2f69..7308380 100644
--- a/.github/workflows/publish-charm.yaml
+++ b/.github/workflows/publish-charm.yaml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         arch:
           - arch: amd64
-            runner: ubuntu-22.04
+            runner: ubuntu-24.04
           - arch: arm64
             runner: [self-hosted, linux, ARM64, medium, jammy]
     runs-on: ${{ matrix.arch.runner }}
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 144ffe8..500c7f0 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -30,22 +30,22 @@ type: charm
 bases:
   - build-on:
     - name: ubuntu
-      channel: "22.04"
+      channel: "24.04"
       architectures:
         - amd64
     run-on:
     - name: ubuntu
-      channel: "22.04"
+      channel: "24.04"
       architectures:
         - amd64
   - build-on:
     - name: ubuntu
-      channel: "22.04"
+      channel: "24.04"
       architectures:
         - arm64
     run-on:
     - name: ubuntu
-      channel: "22.04"
+      channel: "24.04"
       architectures:
         - arm64
 
diff --git a/terraform/main.tf b/terraform/main.tf
index 1a991e5..576697a 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -8,7 +8,7 @@ resource "juju_application" "self-signed-certificates" {
   charm {
     name    = "self-signed-certificates"
     channel = var.channel
-    base    = "ubuntu@22.04"
+    base    = "ubuntu@24.04"
   }
   config = var.config
   units  = 1