diff --git a/.github/workflows/oci-make.yaml b/.github/workflows/oci-make.yaml
index 51b120960342..ba0a6b9f47a1 100644
--- a/.github/workflows/oci-make.yaml
+++ b/.github/workflows/oci-make.yaml
@@ -21,6 +21,10 @@ on:
         # also used in the setup-beam step (same tag should work for both)
         description: OTP version (eg. `26`, `26.2.5.6`)
         default: 27
+      otp_build_version:
+        # OTP to compile RabbitMQ with; needs to match what setup-beam expects
+        description: OTP build version
+        default: 27
       build_arm:
         description: Build for ARM64 as well?
         type: boolean
@@ -37,6 +41,8 @@ jobs:
       matrix:
         otp_version:
         - ${{ github.event.inputs.otp_version || '27' }}
+        otp_build_version:
+        - ${{ github.event.inputs.otp_build_version || '27' }}
     runs-on: ubuntu-latest
     outputs:
       authorized: ${{ steps.authorized.outputs.authorized }}
@@ -56,7 +62,8 @@ jobs:
         if: steps.authorized.outputs.authorized == 'true'
         uses: erlef/setup-beam@v1
         with:
-          otp-version: ${{ matrix.otp_version }}
+          otp-version: ${{ matrix.otp_build_version }}
+          version-type: strict
           elixir-version: latest
       - name: make package-generic-unix
         if: steps.authorized.outputs.authorized == 'true'
diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml
index 690904c211f9..7e2b819177dd 100644
--- a/.github/workflows/test-make-target.yaml
+++ b/.github/workflows/test-make-target.yaml
@@ -34,10 +34,11 @@ jobs:
       run: git fetch --tags
 
     - name: SETUP OTP & ELIXIR
-      uses: erlef/setup-beam@v1.17
+      uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ inputs.erlang_version }}
         elixir-version: ${{ inputs.elixir_version }}
+        version-type: strict
         hexpm-mirrors: |
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
diff --git a/.github/workflows/test-make.yaml b/.github/workflows/test-make.yaml
index eddf299b536c..53a848ac1866 100644
--- a/.github/workflows/test-make.yaml
+++ b/.github/workflows/test-make.yaml
@@ -21,10 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         erlang_version:
-        - '26'
-        - '27'
+        - '28.0-rc2'
         elixir_version:
-        - '1.17'
+        - '1.18.3'
     # @todo Add macOS and Windows.
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -36,10 +35,11 @@ jobs:
       run: git fetch --tags
 
     - name: SETUP OTP & ELIXIR
-      uses: erlef/setup-beam@v1.17
+      uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.erlang_version }}
         elixir-version: ${{ matrix.elixir_version }}
+        version-type: strict
         hexpm-mirrors: |
           https://builds.hex.pm
           https://cdn.jsdelivr.net/hex
@@ -62,9 +62,9 @@ jobs:
       fail-fast: false
       matrix:
         erlang_version:
-        - '27'
+        - '28.0-rc2'
         elixir_version:
-        - '1.17'
+        - '1.18.3'
         metadata_store:
           - mnesia
           - khepri
@@ -81,9 +81,9 @@ jobs:
       fail-fast: false
       matrix:
         erlang_version:
-        - '27'
+        - '28.0-rc2'
         elixir_version:
-        - '1.17'
+        - '1.18.3'
         metadata_store:
           - mnesia
           - khepri
@@ -100,9 +100,9 @@ jobs:
       fail-fast: false
       matrix:
         erlang_version: # Latest OTP
-        - '27'
+        - '28.0-rc2'
         elixir_version: # Latest Elixir
-        - '1.17'
+        - '1.18.3'
     uses: ./.github/workflows/test-make-type-check.yaml
     with:
       erlang_version: ${{ matrix.erlang_version }}