diff --git a/Make.bat b/Make.bat
index 4ea46625e..48cef8949 100644
--- a/Make.bat
+++ b/Make.bat
@@ -166,7 +166,6 @@ REM Main build sequence Ends
 
     ECHO Installing dependencies...
     CALL python -m pip install --upgrade pip || EXIT /B 1
-    CALL python -m pip install --upgrade setuptools || EXIT /B 1
     CALL pip install --only-binary=cryptography -r "%WD%\requirements.txt" || EXIT /B 1
 
     CD %WD%
diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
index 6dca71493..e9c4c796a 100644
--- a/pkg/linux/build-functions.sh
+++ b/pkg/linux/build-functions.sh
@@ -57,7 +57,6 @@ _create_python_virtualenv() {
 
     # Make sure we have the wheel package present, as well as the latest pip
     pip3 install --upgrade pip
-    pip3 install --upgrade setuptools
     pip3 install wheel
 
     # Install the requirements
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
index 0245ca647..0eb2e2a4f 100644
--- a/pkg/mac/build-functions.sh
+++ b/pkg/mac/build-functions.sh
@@ -132,7 +132,6 @@ _build_docs() {
     # shellcheck disable=SC1091
     source "${BUILD_ROOT}/venv/bin/activate"
     pip3 install --upgrade pip
-    pip3 install --upgrade setuptools
     pip3 install -r "${SOURCE_DIR}/requirements.txt"
     pip3 install sphinx
     pip3 install sphinxcontrib-youtube
diff --git a/web/package.json b/web/package.json
index 462d82e21..19c217688 100644
--- a/web/package.json
+++ b/web/package.json
@@ -188,7 +188,7 @@
     "pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web",
     "auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html",
     "auditjs": "yarn audit --groups dependencies",
-    "auditpy": "safety check --full-report -i 40493 -i 51668",
+    "auditpy": "safety check --full-report -i 51668 -i 52495",
     "audit": "yarn run auditjs && yarn run auditpy"
   }
 }