diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 261d2bc..474d2b1 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,8 +13,8 @@ jobs:
           - {name: '3.8', python: '3.8', os: ubuntu-latest, architecture: 'x64', cibuild: "yes"}
           - {name: '3.7', python: '3.7', os: ubuntu-latest, architecture: 'x64', cibuild: "no"}
           - {name: '3.6', python: '3.6', os: ubuntu-latest, architecture: 'x64', cibuild: "no"}
-          - {name: Windows, python: '3.8', os: windows-latest, architecture: 'x64', arch-cx: 'win-amd64', cx_name: 'amd64', cibuild: "no"}
-          - {name: WindowsX86, python: '3.8', os: windows-latest, architecture: 'x86', arch-cx: 'win32', cx_name: 'win32', cibuild: "no"}
+          - {name: Windows, python: '3.8', os: windows-latest, architecture: 'x64', arch-cx: 'win-amd64', cx_name: 'amd64', cibuild: "yes"}
+          - {name: WindowsX86, python: '3.8', os: windows-latest, architecture: 'x86', arch-cx: 'win32', cx_name: 'win32', cibuild: "yes"}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -86,3 +86,4 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          OS: ${{ matrix.os }}
diff --git a/scripts/cibuild.py b/scripts/cibuild.py
index f017c20..d6593ba 100755
--- a/scripts/cibuild.py
+++ b/scripts/cibuild.py
@@ -103,13 +103,12 @@ def pypi_upload():
 logger.info("Branch: {}".format(branch()))
 logger.info("Tag: {}".format(tag()))
 
-if not tag() and branch() != "master":
+if not tag() and branch() != "master" and os.environ.get("CIBUILD") != "yes":
     sys.exit(0)
 
 build_package()
-if os.environ.get("CIBUILD") == "yes":
-    build_docker()
+build_docker()
 aws_upload()
 
-if tag() and os.environ.get("CIBUILD") == "yes":
+if tag() and os.environ.get("OS").startswith("ubuntu"):
     pypi_upload()