diff --git a/hooks/down.sh b/hooks/down.sh
index 2ea1bc6..082732c 100755
--- a/hooks/down.sh
+++ b/hooks/down.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
+
 if [[ $1 == "--config" ]] ; then
   cat <<EOF
 configVersion: v1
 kubernetes:
-- name: Watch softplayer configmaps
+- name: Watch bootstrap configmaps getting removed
   apiVersion: v1
   kind: ConfigMap
   executeHookOnEvent: ["Deleted"]
diff --git a/hooks/up.sh b/hooks/up.sh
index 4074ecb..987b538 100755
--- a/hooks/up.sh
+++ b/hooks/up.sh
@@ -9,7 +9,7 @@ if [[ $1 == "--config" ]] ; then
   cat <<EOF
 configVersion: v1
 kubernetes:
-- name: Watch softplayer configmaps
+- name: Watch bootstrap configmaps getting created
   apiVersion: v1
   kind: ConfigMap
   executeHookOnEvent: ["Added"]
diff --git a/tpls/hetzner-cleanup.yaml b/tpls/hetzner-cleanup.yaml
index e17afbf..f31ecfe 100644
--- a/tpls/hetzner-cleanup.yaml
+++ b/tpls/hetzner-cleanup.yaml
@@ -1,5 +1,5 @@
 apiVersion: tekton.dev/v1beta1
-kind: Pipeline
+kind: PipelineRun
 metadata:
   generateName: hetzner-cleanup
   namespace: "${SP_TEKTON_RUNTIME_NS}"
@@ -9,20 +9,13 @@ spec:
       value: "${SP_CUSTOMER_ID}"
     - name: environment
       value: "${SP_ENVIRONMENT}"
-  tasks:
-    - name: cleanup-hetzner-infra
-      retries: 3
-      taskRef:
-        resolver: cluster
-        params:
-          - name: kind
-            value: task
-          - name: name
-            value: cleanup-hetzner-infra
-          - name: namespace
-            value: tekton-pipelines
-      params:
-        - name: environment
-          value: $(params.environment)
-        - name: namespace
-          value: $(params.namespace)
+  pipelineRef:
+    resolver: cluster
+    params:
+      - name: kind
+        value: pipeline
+      - name: name
+        value: hetzner-cleanup
+      - name: namespace
+        value: tekton-pipelines
+  serviceAccountName: secret-manager