diff --git a/build-scripts/hack/upstream-images.yaml b/build-scripts/hack/upstream-images.yaml
deleted file mode 100644
index 2f8b50f3c..000000000
--- a/build-scripts/hack/upstream-images.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-version: 1
-creds:
-  - registry: ghcr.io
-    user: '{{ env "USERNAME" }}'
-    pass: '{{ env "PASSWORD" }}'
-sync:
-  - source: registry.k8s.io/pause:3.10
-    target: ghcr.io/canonical/k8s-snap/pause:3.10
-    type: image
-  - source: docker.io/bitnami/contour:1.28.2-debian-12-r4
-    target: ghcr.io/canonical/k8s-snap/bitnami/contour:1.28.2-debian-12-r4
-    type: image
-  - source: docker.io/bitnami/envoy:1.28.2-debian-12-r0
-    target: ghcr.io/canonical/k8s-snap/bitnami/envoy:1.28.2-debian-12-r0
-    type: image
-  - source: ghcr.io/projectcontour/contour:v1.28.2
-    target: ghcr.io/canonical/k8s-snap/projectcontour/contour:v1.28.2
-    type: image
-  - source: docker.io/envoyproxy/envoy:v1.29.2
-    target: ghcr.io/canonical/k8s-snap/envoyproxy/envoy:v1.29.2
-    type: image
-  - source: docker.io/calico/apiserver:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/apiserver:v3.28.0
-    type: image
-  - source: docker.io/calico/cni:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/cni:v3.28.0
-    type: image
-  - source: docker.io/calico/csi:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/csi:v3.28.0
-    type: image
-  - source: docker.io/calico/ctl:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/ctl:v3.28.0
-    type: image
-  - source: docker.io/calico/kube-controllers:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/kube-controllers:v3.28.0
-    type: image
-  - source: docker.io/calico/node-driver-registrar:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/node-driver-registrar:v3.28.0
-    type: image
-  - source: docker.io/calico/node:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/node:v3.28.0
-    type: image
-  - source: docker.io/calico/pod2daemon-flexvol:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/pod2daemon-flexvol:v3.28.0
-    type: image
-  - source: docker.io/calico/typha:v3.28.0
-    target: ghcr.io/canonical/k8s-snap/calico/typha:v3.28.0
-    type: image
-  - source: quay.io/tigera/operator:v1.34.0
-    target: ghcr.io/canonical/k8s-snap/tigera/operator:v1.34.0
-    type: image
-  - source: quay.io/metallb/controller:v0.14.8
-    target: ghcr.io/canonical/k8s-snap/metallb/controller:v0.14.8
-    type: image
-  - source: quay.io/metallb/speaker:v0.14.8
-    target: ghcr.io/canonical/k8s-snap/metallb/speaker:v0.14.8
-    type: image
-  - source: quay.io/frrouting/frr:9.0.2
-    target: ghcr.io/canonical/k8s-snap/frrouting/frr:9.0.2
-    type: image
-  - source: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
-    target: ghcr.io/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1
-    type: image
-  - source: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
-    target: ghcr.io/canonical/k8s-snap/sig-storage/csi-provisioner:v5.0.1
-    type: image
-  - source: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
-    target: ghcr.io/canonical/k8s-snap/sig-storage/csi-resizer:v1.11.1
-    type: image
-  - source: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
-    target: ghcr.io/canonical/k8s-snap/sig-storage/csi-snapshotter:v8.0.1
-    type: image
diff --git a/tests/integration/tests/test_cleanup.py b/tests/integration/tests/test_cleanup.py
index 784ac6b4a..ca7fbeaee 100644
--- a/tests/integration/tests/test_cleanup.py
+++ b/tests/integration/tests/test_cleanup.py
@@ -18,7 +18,7 @@
 
 
 @pytest.mark.node_count(1)
-def test_node_cleanup(instances: List[harness.Instance]):
+def test_node_cleanup(instances: List[harness.Instance], tmp_path):
     instance = instances[0]
     util.wait_for_dns(instance)
     util.wait_for_network(instance)
@@ -31,3 +31,6 @@ def test_node_cleanup(instances: List[harness.Instance]):
     )
     for path in CONTAINERD_PATHS:
         assert f"cannot access '{path}': No such file or directory" in process.stderr
+
+    util.setup_k8s_snap(instance, tmp_path)
+    instance.exec(["k8s", "bootstrap"])