diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 09d409d26..45072ddd6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -64,7 +64,6 @@ parts:
       - libpython3.8-stdlib
       - libpython3.8-minimal
       - python3-pip
-      - python3-setuptools
       - python3-wheel
       - python3-venv
       - python3-minimal
@@ -74,13 +73,16 @@ parts:
     # To build cryptography and cffi if needed
     build-packages: [gcc, libffi-dev, libssl-dev, git, libaugeas-dev, python3-dev]
     build-environment:
-      - SNAPCRAFT_PYTHON_VENV_ARGS: --system-site-packages
+      - SNAPCRAFT_PYTHON_VENV_ARGS: --upgrade
       - PIP_NO_BUILD_ISOLATION: "no"
+    override-build: |
+      python3 -m venv "${SNAPCRAFT_PART_INSTALL}"
+      "${SNAPCRAFT_PART_INSTALL}"/bin/python3 "${SNAPCRAFT_PART_SRC}/tools/pipstrap.py"
+      snapcraftctl build
     override-pull: |
-        snapcraftctl pull
-        cd $SNAPCRAFT_PART_SRC
-        python3 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt | grep -v python-augeas > snap-constraints.txt
-        snapcraftctl set-version `grep -oP "__version__ = '\K.*(?=')" $SNAPCRAFT_PART_SRC/certbot/certbot/__init__.py`
+      snapcraftctl pull
+      python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/letsencrypt-auto-source/pieces/dependency-requirements.txt" | grep -v python-augeas > "${SNAPCRAFT_PART_SRC}/snap-constraints.txt"
+      snapcraftctl set-version `grep -oP "__version__ = '\K.*(?=')" "${SNAPCRAFT_PART_SRC}/certbot/certbot/__init__.py"`
   shared-metadata:
     plugin: dump
     source: .