diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 506159c..059fd16 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -8,7 +8,7 @@ on:
       TAG:
         description: Docker CLI tag to build
         required: true
-        default: v24.0.7
+        default: v25.0.1
 
 defaults:
   run:
@@ -33,7 +33,7 @@ jobs:
       working-directory: .
 
     - name: Set Docker CLI tag from inputs
-      if: inputs.TAG
+      if: github.event_name == 'workflow_dispatch'
       run: echo "DOCKER_CLI_REF=${{ inputs.TAG }}" >> "${GITHUB_ENV}"
       working-directory: .
 
@@ -97,18 +97,40 @@ jobs:
 
     - run: mv ./build/docker-linux-amd64 ./build/docker-wsl-amd64
 
+    - name: Build WSL arm64
+      uses: docker/bake-action@v2.2.0
+      with:
+        set: |
+          binary.platform=linux/arm64
+          binary.args.GO_LDFLAGS=-X github.com/docker/cli/cli/config/credentials.LinuxCredentialsStoreDefaultOverride=wincred.exe
+        workdir: cli
+
+    - run: mv ./build/docker-linux-arm64 ./build/docker-wsl-arm64
+
     - name: Build linux amd64
       uses: docker/bake-action@v2.2.0
       with:
         set: binary.platform=linux/amd64
         workdir: cli
 
+    - name: Build linux arm64
+      uses: docker/bake-action@v2.2.0
+      with:
+        set: binary.platform=linux/arm64
+        workdir: cli
+
     - name: Build windows amd64
       uses: docker/bake-action@v2.2.0
       with:
         set: binary.platform=windows/amd64
         workdir: cli
 
+    - name: Build windows arm64
+      uses: docker/bake-action@v2.2.0
+      with:
+        set: binary.platform=windows/arm64
+        workdir: cli
+
     - name:  Calculate Checksums
       working-directory: cli/build
       run: sha256sum docker-* > sha256sum.txt
@@ -128,26 +150,47 @@ jobs:
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      name: Upload Linux artifact
+      name: Upload Linux amd64 artifact
       with:
         name: docker-linux-amd64
         path: cli/build/docker-linux-amd64
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      name: Upload Windows artifact
+      name: Upload Linux arm64 artifact
+      with:
+        name: docker-linux-arm64
+        path: cli/build/docker-linux-arm64
+        if-no-files-found: error
+
+    - uses: actions/upload-artifact@v2
+      name: Upload Windows amd64 artifact
       with:
         name: docker-windows-amd64
         path: cli/build/docker-windows-amd64.exe
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      name: Upload WSL artifact
+      name: Upload WSL amd64 artifact
       with:
         name: docker-wsl-amd64
         path: cli/build/docker-wsl-amd64
         if-no-files-found: error
 
+    - uses: actions/upload-artifact@v2
+      name: Upload Windows arm64 artifact
+      with:
+        name: docker-windows-arm64
+        path: cli/build/docker-windows-arm64.exe
+        if-no-files-found: error
+
+    - uses: actions/upload-artifact@v2
+      name: Upload WSL arm64 artifact
+      with:
+        name: docker-wsl-arm64
+        path: cli/build/docker-wsl-arm64
+        if-no-files-found: error
+
     - uses: actions/upload-artifact@v2
       name: Upload checksums
       with: