diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 728240d04f..8f61fa2a4f 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -40,7 +40,7 @@ jobs:
           for cu in CU_VERSIONS[1:]:
             PY_CU.append((PY_VERSIONS[-1], cu))
           print("Limited matrix PY_CU", PY_CU)
-          PY_ROCM = [(PY_VERSIONS[-1], ROCM_VERSIONS[-1])]
+          PY_ROCM = [(PY_VERSIONS[-1], rocm_v) for rocm_v in ROCM_VERSIONS]
 
         include = []
         for os in ['8-core-ubuntu', 'windows-8-core']:
diff --git a/.github/workflows/wheels_build.yml b/.github/workflows/wheels_build.yml
index 04c723f3b8..47c81d5aaa 100644
--- a/.github/workflows/wheels_build.yml
+++ b/.github/workflows/wheels_build.yml
@@ -153,7 +153,7 @@ jobs:
           amdgpu-install -y --usecase=rocm --no-dkms
           echo "ROCM_PATH=/opt/rocm" >> ${GITHUB_ENV}
           echo "PATH=$PATH:/opt/rocm/bin" >> ${GITHUB_ENV}
-          echo "MAX_JOBS=12" >> ${GITHUB_ENV}
+          echo "MAX_JOBS=15" >> ${GITHUB_ENV}
 
       - name: Install dependencies
         run: $PY -m pip install wheel setuptools twine -r requirements.txt --extra-index-url $PYTORCH_INDEX_URL