diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ae975bc..af6c381 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -90,6 +90,7 @@ jobs:
         run: python scripts/cibuild.py
         env:
           CIBUILD: "yes"
+          BUILD_DOCKER: "no"
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           OS: "ubuntu-latest"
@@ -143,6 +144,7 @@ jobs:
         run: python scripts/cibuild.py
         env:
           CIBUILD: "yes"
+          BUILD_DOCKER: "no"
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           OS: "windows-latest"
@@ -182,6 +184,7 @@ jobs:
         run: python scripts/cibuild.py
         env:
           CIBUILD: "yes"
+          BUILD_DOCKER: "yes"
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
diff --git a/scripts/cibuild.py b/scripts/cibuild.py
index 3a32f86..40f4adf 100755
--- a/scripts/cibuild.py
+++ b/scripts/cibuild.py
@@ -105,7 +105,7 @@ if not tag() and branch() != "master":
 if os.environ.get("CIBUILD") != "yes":
     sys.exit(0)
 
-if os.environ.get("OS").startswith("ubuntu"):
+if os.environ.get("OS").startswith("ubuntu") and os.environ.get("BUILD_DOCKER") == "yes":
     build_docker()
 
 aws_upload()