diff --git a/.bazelrc b/.bazelrc
index 0169edae60..1635fc3b8e 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,9 +10,6 @@ build:buildbuddy --build_metadata=REPO_URL=https://github.com/rabbitmq/rabbitmq-
 build:rbe --config=buildbuddy
 
 build:rbe --remote_executor=grpcs://cloud.buildbuddy.io
-build:rbe --host_platform=//:erlang_24_platform
-build:rbe --platforms=//:erlang_24_platform
-build:rbe --extra_execution_platforms=//:erlang_24_platform
 
 build:rbe --crosstool_top=@buildbuddy_toolchain//:toolchain
 build:rbe --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
@@ -21,7 +18,6 @@ build:rbe --host_javabase=@buildbuddy_toolchain//:javabase_jdk8
 build:rbe --java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
 build:rbe --host_java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
 
-build:rbe --@bazel-erlang//:erlang_version=24
 build:rbe --@bazel-erlang//:erlang_home=/usr/lib/erlang
 build:rbe --//:elixir_home=/usr/local
 
@@ -29,6 +25,18 @@ build:rbe --spawn_strategy=remote
 build:rbe --test_strategy=""
 build:rbe --jobs=50
 
+build:rbe-23 --config=rbe
+build:rbe-23 --host_platform=//:erlang_23_platform
+build:rbe-23 --platforms=//:erlang_23_platform
+build:rbe-23 --extra_execution_platforms=//:erlang_23_platform
+build:rbe-23 --@bazel-erlang//:erlang_version=23
+
+build:rbe-24 --config=rbe
+build:rbe-24 --host_platform=//:erlang_24_platform
+build:rbe-24 --platforms=//:erlang_24_platform
+build:rbe-24 --extra_execution_platforms=//:erlang_24_platform
+build:rbe-24 --@bazel-erlang//:erlang_version=24
+
 # Try importing a user specific .bazelrc
 # You can create your own by copying and editing the template-user.bazelrc template:
 # cp template-user.bazelrc user.bazelrc
diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
index c0154b8092..121b280064 100644
--- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml
+++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml
@@ -27,17 +27,12 @@ jobs:
         echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
         echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
         cat << EOF >> user.bazelrc
-          build:rbe --host_platform=//:erlang_${{ matrix.erlang_version }}_platform
-          build:rbe --platforms=//:erlang_${{ matrix.erlang_version }}_platform
-          build:rbe --extra_execution_platforms=//:erlang_${{ matrix.erlang_version }}_platform
+          build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
+          build:buildbuddy --tls_client_key=buildbuddy-key.pem
 
-          build:rbe --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-          build:rbe --tls_client_certificate=buildbuddy-cert.pem
-          build:rbe --tls_client_key=buildbuddy-key.pem
-
-          build:rbe --build_metadata=ROLE=CI
-          build:rbe --build_metadata=VISIBILITY=PRIVATE
-          build:rbe --remote_instance_name=buildbuddy-io/buildbuddy/ci-aws-${{ matrix.erlang_version }}
+          build:buildbuddy --build_metadata=ROLE=CI
+          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
+          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-aws-${{ matrix.erlang_version }}
         EOF
     #! - name: Setup tmate session
     #!   uses: mxschmitt/action-tmate@v3
@@ -45,7 +40,7 @@ jobs:
       run: |
         branch_or_tag="${GITHUB_REF##*/}"
         bazelisk test //deps/rabbitmq_peer_discovery_aws:integration_SUITE \
-          --config=rbe \
+          --config=rbe-${{ matrix.erlang_version }} \
           --test_tag_filters=aws \
           --build_tests_only \
           --test_env AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2031efa0ee..333752e239 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,19 +25,13 @@ jobs:
           build:buildbuddy --build_metadata=ROLE=CI
           build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
           build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${{ matrix.erlang_version }}
-
-          build:rbe --host_platform=//:erlang_${{ matrix.erlang_version }}_platform
-          build:rbe --platforms=//:erlang_${{ matrix.erlang_version }}_platform
-          build:rbe --extra_execution_platforms=//:erlang_${{ matrix.erlang_version }}_platform
-
-          build:rbe --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
         EOF
     #! - name: Setup tmate session
     #!   uses: mxschmitt/action-tmate@v3
     - name: RUN TESTS
       run: |
         bazelisk test //... \
-          --config=rbe \
+          --config=rbe-${{ matrix.erlang_version }} \
           --test_tag_filters=-exclusive,-aws \
           --verbose_failures
   test-exclusive: