diff --git a/.github/workflows/rel-lnx.yml b/.github/workflows/rel-lnx.yml
index b672e94443..fca07bd5bc 100644
--- a/.github/workflows/rel-lnx.yml
+++ b/.github/workflows/rel-lnx.yml
@@ -29,8 +29,8 @@ jobs:
       uses: "./.github/actions/boot"
       with:
         hostos:     'lnx'
+        buildcmd:   "ci/buildx.sh ${{ inputs.tools }}"
         suffix:     "lnx ${{ inputs.arch }} ${{ inputs.tools }}"
-        tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
         owdebug:    ${{ inputs.owdebug }}
   build-lnx:
diff --git a/.github/workflows/rel-nt.yml b/.github/workflows/rel-nt.yml
index 6ee42f75ce..3f1e658438 100644
--- a/.github/workflows/rel-nt.yml
+++ b/.github/workflows/rel-nt.yml
@@ -29,8 +29,8 @@ jobs:
       uses: "./.github/actions/boot"
       with:
         hostos:     'nt'
+        buildcmd:   "ci/buildx.cmd ${{ inputs.tools }}"
         suffix:     "nt ${{ inputs.arch }} ${{ inputs.tools }}"
-        tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
         owdebug:    ${{ inputs.owdebug }}
   build-nt:
diff --git a/.github/workflows/rel-osx.yml b/.github/workflows/rel-osx.yml
index 5d994eaa2a..1639267bce 100644
--- a/.github/workflows/rel-osx.yml
+++ b/.github/workflows/rel-osx.yml
@@ -32,8 +32,8 @@ jobs:
       uses: "./.github/actions/boot"
       with:
         hostos:     'osx'
+        buildcmd:   "ci/buildx.sh ${{ inputs.tools }}"
         suffix:     "osx ${{ inputs.arch }} ${{ inputs.tools }}"
-        tools:      ${{ inputs.tools }}
         owtools:    ${{ inputs.owtools }}
         owdebug:    ${{ inputs.owdebug }}
   build-osx:
diff --git a/.github/workflows/wikidocs.yml b/.github/workflows/wikidocs.yml
index c50f5d77c4..7c5b652bf9 100644
--- a/.github/workflows/wikidocs.yml
+++ b/.github/workflows/wikidocs.yml
@@ -52,8 +52,8 @@ jobs:
       uses: "./.github/actions/boot"
       with:
         hostos:         'nt'
+        buildcmd:       'ci/buildx.sh vs2019'
         suffix:         'nt x64 vs2019'
-        tools:          'vs2019'
         owtools:        'VISUALC'
         noarchive:      '1'
         owdebug:        ${{ vars.OWDEBUG }}