diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81b63a8..34aac30 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,8 +53,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }}
+        OPTIONAL_DEPS: ${{ github.event.inputs.optional_deps }}
       run: |
-        python -u autobuild.py write-build-plan --optional-deps '${{ github.event.inputs.optional_deps }}' build_plan.json
+        python -u autobuild.py write-build-plan --optional-deps "$env:OPTIONAL_DEPS" build_plan.json
         buildPlan="$(cat build_plan.json)"
         echo "::set-output name=build-plan::$buildPlan"
 
@@ -71,8 +72,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }}
+        OPTIONAL_DEPS: ${{ github.event.inputs.optional_deps }}
       run: |
-        python -u autobuild.py show --optional-deps '${{ github.event.inputs.optional_deps }}'
+        python -u autobuild.py show --optional-deps "$env:OPTIONAL_DEPS"
 
   build:
     needs: schedule
diff --git a/.github/workflows/maint.yml b/.github/workflows/maint.yml
index 1369c99..de638f5 100644
--- a/.github/workflows/maint.yml
+++ b/.github/workflows/maint.yml
@@ -46,8 +46,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }}
+        CLEAR_FAILED_BUILD_TYPES: ${{ github.event.inputs.clear_failed_build_types }}
       run: |
-        python -u autobuild.py clear-failed --build-types '${{ github.event.inputs.clear_failed_build_types }}'
+        python -u autobuild.py clear-failed --build-types "$env:CLEAR_FAILED_BUILD_TYPES"
         python -u autobuild.py update-status
 
     - name: Clear failed packages
@@ -55,6 +56,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }}
+        CLEAR_FAILED_PACKAGES: ${{ github.event.inputs.clear_failed_packages }}
       run: |
-        python -u autobuild.py clear-failed --packages '${{ github.event.inputs.clear_failed_packages }}'
+        python -u autobuild.py clear-failed --packages "$env:CLEAR_FAILED_PACKAGES"
         python -u autobuild.py update-status