diff --git a/.github/workflows/update-armeria-version.yml b/.github/workflows/update-armeria-version.yml
index df27359804..786fc15fb9 100644
--- a/.github/workflows/update-armeria-version.yml
+++ b/.github/workflows/update-armeria-version.yml
@@ -9,19 +9,36 @@ on:
         type: string
 
 jobs:
-  update-armeria-version:
+
+  wait-for-armeria-artifacts:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        artifact:
+          - armeria-bom
+          - armeria
+          - armeria-grpc
+          - armeria-prometheus1
+          - armeria-saml
+          - armeria-thrift
+          - armeria-xds
+
     steps:
       - uses: actions/checkout@v3
 
       - name: Wait for Armeria artifacts to be available
         uses: nev7n/wait_for_response@v1
         with:
-          url: "https://repo.maven.apache.org/maven2/com/linecorp/armeria/armeria-bom/${{ inputs.armeria_version }}/armeria-bom-${{ inputs.armeria_version }}.pom"
+          url: "https://repo.maven.apache.org/maven2/com/linecorp/armeria/${{ matrix.artifact }}/${{ github.event.inputs.armeria_version }}/${{ matrix.artifact }}-${{ github.event.inputs.armeria_version }}.${{ matrix.artifact == 'armeria-bom' && 'bom' || 'jar' }}"
           responseCode: 200
           timeout: 18000000 # Timeout before giving up in milliseconds. 5 hours
           interval: 60000 # 1 minute
 
+  update-armeria-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
       - name: Update Armeria version to ${{ inputs.armeria_version }}
         run: |
           sed -i "s/armeria = \".*\"/armeria = \"${{ inputs.armeria_version }}\"/" dependencies.toml
@@ -40,7 +57,7 @@ jobs:
         with:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           title: Update Armeria version to ${{ inputs.armeria_version }}
-          body : ''
+          body: ''
           commit-message: Update Armeria version to ${{ inputs.armeria_version }}
           author: Meri Kim <dl_armeria@linecorp.com>
           branch: update-armeria-version