diff --git a/snap/local/build_and_install.sh b/snap/local/build_and_install.sh
index 6058fa359..b5883bc8a 100755
--- a/snap/local/build_and_install.sh
+++ b/snap/local/build_and_install.sh
@@ -26,11 +26,15 @@ source "${DIR}/common.sh"
 RegisterQemuHandlers
 ResolveArch "${SNAP_ARCH}"
 
-docker run --net=host -d --rm -v "${DIR}/packages:/data/packages" --name pypiserver pypiserver/pypiserver
 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt > snap-constraints.txt
 
+pushd "${DIR}/packages"
+"${CERTBOT_DIR}/tools/simple_http_server.py" 8080 >/dev/null 2>&1 &
+HTTP_SERVER_PID="$!"
+popd
+
 function cleanup() {
-    docker rm --force pypiserver
+    kill "${HTTP_SERVER_PID}"
 }
 
 trap cleanup EXIT
@@ -40,7 +44,7 @@ docker run \
   --net=host \
   -v "${CERTBOT_DIR}:/certbot" \
   -w "/certbot" \
-  -e "PIP_EXTRA_INDEX_URL=http://localhost:8080/simple" \
+  -e "PIP_EXTRA_INDEX_URL=http://localhost:8080" \
   "adferrand/snapcraft:${DOCKER_ARCH}-stable" \
   snapcraft
 
diff --git a/snap/local/compile_native_wheels.sh b/snap/local/compile_native_wheels.sh
index 10e8435dd..cb6495410 100755
--- a/snap/local/compile_native_wheels.sh
+++ b/snap/local/compile_native_wheels.sh
@@ -32,9 +32,10 @@ for SNAP_ARCH in ${TARGET_ARCHS}; do
 && python3 -m venv /build/venv \
 && /build/venv/bin/pip install wheel \
 && /build/venv/bin/pip wheel cryptography cffi -c snap-constraints.txt -w /build \
-&& mkdir -p /workspace/packages \
-&& mv /build/cryptography* /build/cffi* /workspace/packages \
-&& chmod 775 /workspace/packages \
-&& chmod 664 /workspace/packages/*
+&& mkdir -p /workspace/packages/cffi /workspace/packages/cryptography \
+&& mv /build/cryptography-* /workspace/packages/cryptography \
+&& mv /build/cffi-* /workspace/packages/cffi \
+&& chmod 775 /workspace/packages /workspace/packages/cffi /workspace/packages/cryptography \
+&& chmod 664 /workspace/packages/cffi/* /workspace/packages/cryptography/*
 "
 done
diff --git a/snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl b/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl
similarity index 100%
rename from snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl
rename to snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_aarch64.whl
diff --git a/snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl b/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl
similarity index 100%
rename from snap/local/packages/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl
rename to snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-linux_armv7l.whl
diff --git a/snap/local/packages/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl b/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl
similarity index 100%
rename from snap/local/packages/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl
rename to snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl
diff --git a/snap/local/packages/cryptography-2.8-cp36-cp36m-linux_aarch64.whl b/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_aarch64.whl
similarity index 100%
rename from snap/local/packages/cryptography-2.8-cp36-cp36m-linux_aarch64.whl
rename to snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_aarch64.whl
diff --git a/snap/local/packages/cryptography-2.8-cp36-cp36m-linux_armv7l.whl b/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_armv7l.whl
similarity index 100%
rename from snap/local/packages/cryptography-2.8-cp36-cp36m-linux_armv7l.whl
rename to snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_armv7l.whl
diff --git a/snap/local/packages/cryptography-2.8-cp36-cp36m-linux_i686.whl b/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl
similarity index 100%
rename from snap/local/packages/cryptography-2.8-cp36-cp36m-linux_i686.whl
rename to snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl