diff --git a/Makefile b/Makefile
index fb60659..524e0a5 100644
--- a/Makefile
+++ b/Makefile
@@ -54,17 +54,15 @@ export CUSTOM_COMPILE_COMMAND = make upgrade
 upgrade: piptools $(COMMON_CONSTRAINTS_TXT)	## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	# Make sure to compile files after any other files they include!
 	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
-	pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip.txt
 	pip install -qr requirements/pip-tools.txt
-	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/base.txt requirements/base.in
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/docs.txt requirements/docs.in
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/test.txt requirements/test.in
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/dev.txt requirements/dev.in
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/tox.txt requirements/tox.in
-	pip-compile --upgrade  --allow-unsafe --verbose --rebuild -o requirements/ci.txt requirements/ci.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/base.txt requirements/base.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/docs.txt requirements/docs.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/test.txt requirements/test.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/dev.txt requirements/dev.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/tox.txt requirements/tox.in
+	pip-compile --upgrade --verbose --rebuild -o requirements/ci.txt requirements/ci.in
 	# Let tox control the Django and DRF versions for tests
 	sed -i.tmp '/^django==/d' requirements/test.txt
 	sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
diff --git a/requirements/base.in b/requirements/base.in
index 5a980ce..18a523f 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -7,4 +7,3 @@ django-model-utils
 jsonfield
 pytz
 djangorestframework
-setuptools
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index b527956..d9d9027 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,7 @@ commands =
 
 [testenv:docs]
 deps =
+    setuptools
     -r{toxinidir}/requirements/dev.txt
 commands = 
     python setup.py build_sphinx