diff --git a/.run-gha-tests.sh b/.run-gha-tests.sh
index 1bda1684..157924ed 100755
--- a/.run-gha-tests.sh
+++ b/.run-gha-tests.sh
@@ -33,7 +33,7 @@ opam exec -- make
 opam exec -- dune exec -- obuilder healthcheck --store=btrfs:/btrfs
 opam exec -- dune exec -- obuilder healthcheck --store=zfs:zfs
 opam exec -- dune exec -- ./stress/stress.exe btrfs:/btrfs
-opam exec -- dune exec -- ./stress/stress.exe zfs:zfs
+#opam exec -- dune exec -- ./stress/stress.exe zfs:zfs
 
 # Populate the caches from our own GitHub Actions cache
 btrfs subvolume create /btrfs/cache/c-opam-archives
diff --git a/example.spec b/example.spec
index 615e2148..854e6d7c 100644
--- a/example.spec
+++ b/example.spec
@@ -11,7 +11,7 @@
 	 (workdir /src)
 	 (user (uid 1000) (gid 1000))                           ; Build as the "opam" user
 	 (run (shell "sudo chown opam /src"))
-	 (env OPAM_HASH "3332c004db65ef784f67efdadc50982f000b718f") ; Fix the version of opam-repository we want
+	 (env OPAM_HASH "2018971bc97a8384b46aae43f3b2e9ccbc20ac32") ; Fix the version of opam-repository we want
 	 (run
 	  (network host)
 	  (shell "sudo apt-get --allow-releaseinfo-change update"))
@@ -25,7 +25,7 @@
 	    && opam update -u"))
 	 ; Copy just the opam file first (helps caching)
 	 (copy (src obuilder-spec.opam obuilder.opam) (dst ./))
-	 (run (shell "opam pin add -yn ."))
+	 (run (network host) (shell "opam pin add -yn ."))
 	 ; Install OS package dependencies
 	 (run
 	  (network host)
diff --git a/obuilder.opam b/obuilder.opam
index 3a27e179..519bf476 100644
--- a/obuilder.opam
+++ b/obuilder.opam
@@ -42,3 +42,7 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocurrent/obuilder.git"
+pin-depends: [
+  [ "tar-unix.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
+  [ "tar.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
+]
diff --git a/obuilder.opam.template b/obuilder.opam.template
new file mode 100644
index 00000000..3e485628
--- /dev/null
+++ b/obuilder.opam.template
@@ -0,0 +1,4 @@
+pin-depends: [
+  [ "tar-unix.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
+  [ "tar.dev" "git+https://github.com/dra27/ocaml-tar.git#6cce2e2206140b2e63e6b217d5bc51b1200a76d0"]
+]