diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 8fa8d97..6db6f47 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -27,12 +27,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'py36-cover (windows/x86_64)'
+          - name: 'py36-cover (windows/amd64)'
             python: '3.6'
             toxpython: 'python3.6'
             python_arch: 'x64'
             tox_env: 'py36-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'py36-cover (macos/x86_64)'
@@ -43,14 +43,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'py36-cover (macos/arm64)'
-            python: '3.6'
-            toxpython: 'python3.6'
-            python_arch: 'x64'
-            tox_env: 'py36-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'py36-nocov (ubuntu/x86_64/manylinux)'
             python: '3.6'
             toxpython: 'python3.6'
@@ -83,12 +75,12 @@ jobs:
             cibw_arch: 'aarch64'
             cibw_build: 'cp36-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'py36-nocov (windows/x86_64)'
+          - name: 'py36-nocov (windows/amd64)'
             python: '3.6'
             toxpython: 'python3.6'
             python_arch: 'x64'
             tox_env: 'py36-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: 'cp36-*'
             os: 'windows-latest'
           - name: 'py36-nocov (windows/x86)'
@@ -107,14 +99,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp36-*'
             os: 'macos-latest'
-          - name: 'py36-nocov (macos/arm64)'
-            python: '3.6'
-            toxpython: 'python3.6'
-            python_arch: 'x64'
-            tox_env: 'py36-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: 'cp36-*'
-            os: 'macos-latest'
           - name: 'py37-cover (ubuntu/x86_64)'
             python: '3.7'
             toxpython: 'python3.7'
@@ -123,12 +107,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'py37-cover (windows/x86_64)'
+          - name: 'py37-cover (windows/amd64)'
             python: '3.7'
             toxpython: 'python3.7'
             python_arch: 'x64'
             tox_env: 'py37-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'py37-cover (macos/x86_64)'
@@ -139,14 +123,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'py37-cover (macos/arm64)'
-            python: '3.7'
-            toxpython: 'python3.7'
-            python_arch: 'x64'
-            tox_env: 'py37-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'py37-nocov (ubuntu/x86_64/manylinux)'
             python: '3.7'
             toxpython: 'python3.7'
@@ -179,12 +155,12 @@ jobs:
             cibw_arch: 'aarch64'
             cibw_build: 'cp37-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'py37-nocov (windows/x86_64)'
+          - name: 'py37-nocov (windows/amd64)'
             python: '3.7'
             toxpython: 'python3.7'
             python_arch: 'x64'
             tox_env: 'py37-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: 'cp37-*'
             os: 'windows-latest'
           - name: 'py37-nocov (windows/x86)'
@@ -203,14 +179,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp37-*'
             os: 'macos-latest'
-          - name: 'py37-nocov (macos/arm64)'
-            python: '3.7'
-            toxpython: 'python3.7'
-            python_arch: 'x64'
-            tox_env: 'py37-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: 'cp37-*'
-            os: 'macos-latest'
           - name: 'py38-cover (ubuntu/x86_64)'
             python: '3.8'
             toxpython: 'python3.8'
@@ -219,12 +187,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'py38-cover (windows/x86_64)'
+          - name: 'py38-cover (windows/amd64)'
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'x64'
             tox_env: 'py38-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'py38-cover (macos/x86_64)'
@@ -235,14 +203,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'py38-cover (macos/arm64)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'py38-nocov (ubuntu/x86_64/manylinux)'
             python: '3.8'
             toxpython: 'python3.8'
@@ -275,12 +235,12 @@ jobs:
             cibw_arch: 'aarch64'
             cibw_build: 'cp38-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'py38-nocov (windows/x86_64)'
+          - name: 'py38-nocov (windows/amd64)'
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'x64'
             tox_env: 'py38-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: 'cp38-*'
             os: 'windows-latest'
           - name: 'py38-nocov (windows/x86)'
@@ -299,14 +259,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp38-*'
             os: 'macos-latest'
-          - name: 'py38-nocov (macos/arm64)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: 'cp38-*'
-            os: 'macos-latest'
           - name: 'py39-cover (ubuntu/x86_64)'
             python: '3.9'
             toxpython: 'python3.9'
@@ -315,12 +267,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'py39-cover (windows/x86_64)'
+          - name: 'py39-cover (windows/amd64)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
             tox_env: 'py39-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'py39-cover (macos/x86_64)'
@@ -331,14 +283,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'py39-cover (macos/arm64)'
-            python: '3.9'
-            toxpython: 'python3.9'
-            python_arch: 'x64'
-            tox_env: 'py39-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'py39-nocov (ubuntu/x86_64/manylinux)'
             python: '3.9'
             toxpython: 'python3.9'
@@ -371,12 +315,12 @@ jobs:
             cibw_arch: 'aarch64'
             cibw_build: 'cp39-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'py39-nocov (windows/x86_64)'
+          - name: 'py39-nocov (windows/amd64)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
             tox_env: 'py39-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: 'cp39-*'
             os: 'windows-latest'
           - name: 'py39-nocov (windows/x86)'
@@ -395,14 +339,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp39-*'
             os: 'macos-latest'
-          - name: 'py39-nocov (macos/arm64)'
-            python: '3.9'
-            toxpython: 'python3.9'
-            python_arch: 'x64'
-            tox_env: 'py39-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: 'cp39-*'
-            os: 'macos-latest'
           - name: 'py310-cover (ubuntu/x86_64)'
             python: '3.10'
             toxpython: 'python3.10'
@@ -411,12 +347,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'py310-cover (windows/x86_64)'
+          - name: 'py310-cover (windows/amd64)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
             tox_env: 'py310-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'py310-cover (macos/x86_64)'
@@ -427,14 +363,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'py310-cover (macos/arm64)'
-            python: '3.10'
-            toxpython: 'python3.10'
-            python_arch: 'x64'
-            tox_env: 'py310-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'py310-nocov (ubuntu/x86_64/manylinux)'
             python: '3.10'
             toxpython: 'python3.10'
@@ -467,12 +395,12 @@ jobs:
             cibw_arch: 'aarch64'
             cibw_build: 'cp310-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'py310-nocov (windows/x86_64)'
+          - name: 'py310-nocov (windows/amd64)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
             tox_env: 'py310-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: 'cp310-*'
             os: 'windows-latest'
           - name: 'py310-nocov (windows/x86)'
@@ -491,14 +419,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp310-*'
             os: 'macos-latest'
-          - name: 'py310-nocov (macos/arm64)'
-            python: '3.10'
-            toxpython: 'python3.10'
-            python_arch: 'x64'
-            tox_env: 'py310-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: 'cp310-*'
-            os: 'macos-latest'
           - name: 'pypy37-cover (ubuntu/x86_64)'
             python: 'pypy-3.7'
             toxpython: 'pypy3.7'
@@ -507,12 +427,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'pypy37-cover (windows/x86_64)'
+          - name: 'pypy37-cover (windows/amd64)'
             python: 'pypy-3.7'
             toxpython: 'pypy3.7'
             python_arch: 'x64'
             tox_env: 'pypy37-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'pypy37-cover (macos/x86_64)'
@@ -523,14 +443,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'pypy37-cover (macos/arm64)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
-            python_arch: 'x64'
-            tox_env: 'pypy37-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'pypy37-nocov (ubuntu/x86_64/manylinux)'
             python: 'pypy-3.7'
             toxpython: 'pypy3.7'
@@ -539,12 +451,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'pypy37-nocov (windows/x86_64)'
+          - name: 'pypy37-nocov (windows/amd64)'
             python: 'pypy-3.7'
             toxpython: 'pypy3.7'
             python_arch: 'x64'
             tox_env: 'pypy37-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'pypy37-nocov (macos/x86_64)'
@@ -555,14 +467,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'pypy37-nocov (macos/arm64)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
-            python_arch: 'x64'
-            tox_env: 'pypy37-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'pypy38-cover (ubuntu/x86_64)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
@@ -571,12 +475,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'pypy38-cover (windows/x86_64)'
+          - name: 'pypy38-cover (windows/amd64)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'x64'
             tox_env: 'pypy38-cover,codecov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'pypy38-cover (macos/x86_64)'
@@ -587,14 +491,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'pypy38-cover (macos/arm64)'
-            python: 'pypy-3.8'
-            toxpython: 'pypy3.8'
-            python_arch: 'x64'
-            tox_env: 'pypy38-cover,codecov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
           - name: 'pypy38-nocov (ubuntu/x86_64/manylinux)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
@@ -603,12 +499,12 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'ubuntu-latest'
-          - name: 'pypy38-nocov (windows/x86_64)'
+          - name: 'pypy38-nocov (windows/amd64)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'x64'
             tox_env: 'pypy38-nocov'
-            cibw_arch: 'x86_64'
+            cibw_arch: 'amd64'
             cibw_build: false
             os: 'windows-latest'
           - name: 'pypy38-nocov (macos/x86_64)'
@@ -619,14 +515,6 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'pypy38-nocov (macos/arm64)'
-            python: 'pypy-3.8'
-            toxpython: 'pypy3.8'
-            python_arch: 'x64'
-            tox_env: 'pypy38-nocov'
-            cibw_arch: 'arm64'
-            cibw_build: false
-            os: 'macos-latest'
     steps:
     - uses: docker/setup-qemu-action@v1
       if: matrix.cibw_arch == 'aarch64'
diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml
index 81b6cd6..676dad5 100644
--- a/ci/templates/.github/workflows/github-actions.yml
+++ b/ci/templates/.github/workflows/github-actions.yml
@@ -35,10 +35,9 @@ jobs:
     ['ubuntu', 'x64', 'x86_64', '*musllinux*', False],
     ['ubuntu', 'x64', 'aarch64', '*manylinux*', False],
     ['ubuntu', 'x64', 'aarch64', '*musllinux*', False],
-    ['windows', 'x64', 'x86_64', '*', True],
+    ['windows', 'x64', 'amd64', '*', True],
     ['windows', 'x86', 'x86', '*', False],
     ['macos', 'x64', 'x86_64', '*', True],
-    ['macos', 'x64', 'arm64', '*', True],
 ] %}
 {% if include_cover or ('nocov' in env and not prefix.startswith('pypy')) %}
 {% set wheel_suffix = 'nocov' in env and wheel_arch.strip('*') %}