diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
index 78d77c8a5b..630cb6cbc6 100644
--- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml
+++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         erlang_version:
-        - "23"
+        - "24"
     timeout-minutes: 45
     steps:
     - name: CHECKOUT REPOSITORY
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 9f601e972c..60d6cab5d4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,6 +8,7 @@ jobs:
       matrix:
         erlang_version:
         - "23"
+        - "24"
     timeout-minutes: 120
     steps:
     - name: CHECKOUT REPOSITORY
@@ -61,6 +62,7 @@ jobs:
       matrix:
         erlang_version:
         - "23"
+        - "24"
     timeout-minutes: 60
     steps:
     - name: CHECKOUT REPOSITORY
diff --git a/BUILD.bazel b/BUILD.bazel
index 816bc85b21..5b3afc862c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -29,6 +29,19 @@ platform(
     },
 )
 
+platform(
+    name = "erlang_24_platform",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        "@bazel_tools//tools/cpp:clang",
+    ],
+    exec_properties = {
+        "OSFamily": "Linux",
+        "container-image": "docker://pivotalrabbitmq/rabbitmq-server-buildenv@sha256:09d379e889dedfa492736584721d74e580d35b31ee2b3f996320872d1f76505e",
+    },
+)
+
 rabbitmq_home(
     name = "broker-home",
     plugins = [