diff --git a/setup/management.sh b/setup/management.sh
index dcef0891..5683b45c 100755
--- a/setup/management.sh
+++ b/setup/management.sh
@@ -30,6 +30,7 @@ apt_install duplicity python-pip virtualenv certbot
 # b2sdk is used for backblaze backups.
 # boto is used for amazon aws backups.
 # Both are installed outside the pipenv, so they can be used by duplicity
+hide_output pip3 install --upgrade setuptools
 hide_output pip3 install --upgrade b2sdk boto
 
 # Create a virtualenv for the installation of Python 3 packages
diff --git a/setup/system.sh b/setup/system.sh
index ed399ba0..208a35df 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -131,7 +131,7 @@ apt_get_quiet autoremove
 # * openssh-client: provides ssh-keygen
 
 echo Installing system packages...
-apt_install python3 python3-dev python3-pip python3-setuptools \
+apt_install python3 python3-dev python3-pip \
 	netcat-openbsd wget curl git sudo coreutils bc \
 	haveged pollinate openssh-client unzip \
 	unattended-upgrades cron ntp fail2ban rsyslog