diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 297562c..161d18c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,10 @@ jobs:
       - name: Install Hatch
         run: |
           pip install hatch
+      - name: Pin virtualenv for Python 3.9
+        if: matrix.python == '3.9'
+        run: |
+          pip install 'virtualenv<21'
       - name: Install dependencies
         run: |
           hatch run test:pip freeze
diff --git a/Makefile b/Makefile
index f86c713..000bc07 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,18 @@ clean:  ## Clean intermediate build files
 	rm -rf dist/
 .PHONY: clean
 
-build: clean dev  ## Build the package (source distribution)
-	python setup.py sdist
+build: clean  ## Build the package (source distribution + wheel)
+	hatch build
 .PHONY: build
 
 dev: clean  ## Setup development environment
-	pip install .[dev]
+	hatch env create
 .PHONY: dev
 
-test: dev ## Run tests
-	.tools/ci.sh
+test:  ## Run tests
+	hatch run test:test
 .PHONY: test
 
 release: build  ## Release to PyPi
-	twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+	hatch publish
 .PHONY: release