diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 35d26c74f..6133c60ba 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -190,7 +190,7 @@ jobs:
         run: dotnet clean --configuration Release && dotnet nuget locals all --clear
 
       - name: Install dependencies
-        run: dotnet restore -r "${{ matrix.target}}"
+        run: dotnet restore -r "${{ matrix.target }}"
 
       - uses: suisei-cn/actions-download-file@v1
         if: ${{ matrix.kind }} == "windows"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c8b595d57..9d2c2a5bb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -27,13 +27,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - id: builder-base
+          - name: base
             path: ''
             suffix: ''
-          - id: builder-nvidia
+          - name: nvidia
             path: 'nvidia/'
             suffix: '-nvidia'
-          - id: builder-vaapi
+          - name: vaapi
             path: 'vaapi/'
             suffix: '-vaapi'
     steps:
@@ -42,9 +42,9 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Docker Buildx Base
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        id: ${{ matrix.id }}
+        id: docker-buildx
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -55,7 +55,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          builder: ${{ format('steps.{0}.outputs.name', matrix.id) }}
+          builder: ${{ steps.docker-buildx.outputs.name }}
           context: .
           file: ./docker/${{ matrix.path }}Dockerfile
           push: true