diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
new file mode 100644
index 00000000..5b2225d8
--- /dev/null
+++ b/.github/workflows/cleanup.yaml
@@ -0,0 +1,25 @@
+name: cleanup-clusters
+
+env:
+  DOCKER_ORG: digitalocean
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  cleanup-clusters:
+    name: Clean up clusters from the PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: cleanup
+        env:
+          DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.CSIDigitalOceanAccessToken }}
+          BRANCH: ${{ github.head_ref }}
+        run: |
+          set -eu
+          # Variable definitions and runner image must match things in test.yaml.
+
+          BRANCH="$(echo -n ${BRANCH} | tr -c '[:alnum:]._-' '-')"
+          TAG_IDENTIFIER="$(echo -n ${BRANCH} | sha256sum | cut -c1-7)"
+          docker run --rm -e DIGITALOCEAN_ACCESS_TOKEN --entrypoint /cleanup-clusters.sh ${DOCKER_ORG}/k8s-e2e-test-runner:${BRANCH}-latest "branch-identifier:${TAG_IDENTIFIER}"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 58f84c4f..179c747c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -132,7 +132,7 @@ jobs:
             TAG=latest
           fi
 
-          TIMEOUT=60m make test-e2e E2E_ARGS="-ginkgo-nodes ${NUM_GINKGO_NODES} -driver-image ${DOCKER_ORG}/do-csi-plugin-dev:${TAG} -runner-image ${DOCKER_ORG}/k8s-e2e-test-runner:${RUNNER_IMAGE_TAG_PREFIX}latest -name-suffix ${NAME_SUFFIX} ${{ matrix.kube-release }}"
+          TIMEOUT=60m make test-e2e E2E_ARGS="-ginkgo-nodes ${NUM_GINKGO_NODES} -driver-image ${DOCKER_ORG}/do-csi-plugin-dev:${TAG} -runner-image ${DOCKER_ORG}/k8s-e2e-test-runner:${RUNNER_IMAGE_TAG_PREFIX}latest -name-suffix ${NAME_SUFFIX} -retain ${{ matrix.kube-release }}"
 
   tag-new-master-image:
     runs-on: ubuntu-18.04
diff --git a/test/e2e/Dockerfile b/test/e2e/Dockerfile
index 8fecad97..0e28a9a4 100644
--- a/test/e2e/Dockerfile
+++ b/test/e2e/Dockerfile
@@ -75,6 +75,9 @@ COPY --from=tools /tini /sbin/
 COPY --from=tools /doctl /usr/local/bin/
 COPY --from=tools /ginkgo /usr/local/bin/
 COPY --from=tools /kubectl /usr/local/bin/
+
+COPY cleanup-clusters.sh /
+
 # Docker comes with built-in tini support (--init parameter) but does not allow
 # to enable child process group killing
 # (https://github.com/krallin/tini#process-group-killing) via "-g". We need this
diff --git a/test/e2e/cleanup-clusters.sh b/test/e2e/cleanup-clusters.sh
new file mode 100755
index 00000000..8505527d
--- /dev/null
+++ b/test/e2e/cleanup-clusters.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Copyright 2020 DigitalOcean
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### Delete clusters that match a given DO tag along with all managed volumes that
+### may still exist.
+
+set -o errexit
+set -o nounset
+
+if ! type doctl > /dev/null 2>&1; then
+  echo "doctl is missing" >&2
+  exit 1
+fi
+
+if [[ $# -ne 1 ]]; then
+  echo "usage: $(basename "$0") <identifying cluster tag>" >&2
+  exit 1
+fi
+
+readonly CLUSTER_TAG="$1"
+
+echo "Cleaning up clusters based on cluster tag: ${CLUSTER_TAG}"
+
+while read -r cluster_uuid; do
+  if doctl kubernetes cluster get "${cluster_uuid}" --no-header --format Tags | grep -q "${CLUSTER_TAG}"; then
+    echo "Deleting cluster ${cluster_uuid}"
+    doctl kubernetes cluster delete -f "${cluster_uuid}"
+    echo "Deleting volumes for cluster ${cluster_uuid}"
+    doctl compute volume list --no-header --format ID,Tags | grep "k8s:${cluster_uuid}" | awk '{print $1}' | xargs -n 1 doctl compute volume delete -f
+  fi
+done < <(doctl kubernetes cluster list --no-header --format ID)   # --format field "Tags" does not work on the "list" command
+echo "Done."
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 1cc843b1..251cace8 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -388,7 +388,7 @@ func createCluster(ctx context.Context, client *godo.Client, nameSuffix, kubeMaj
 		Name:        clusterName,
 		RegionSlug:  "fra1",
 		VersionSlug: versionSlug,
-		Tags:        []string{"csi-e2e-test", versionTag},
+		Tags:        []string{"csi-e2e-test", versionTag, fmt.Sprintf("branch-identifier:%s", nameSuffix)},
 		NodePools: []*godo.KubernetesNodePoolCreateRequest{
 			{
 				Name:  clusterName + "-pool",