diff --git a/Tests/cleanup.py b/Tests/cleanup.py
index cac932784..1357f0748 100755
--- a/Tests/cleanup.py
+++ b/Tests/cleanup.py
@@ -188,7 +188,7 @@ def main(argv):
         if opt[0] == "-h" or opt[0] == "--help":
             print_usage()
             return 0
-        if opt[0] == "-i" or opt[0] == "--prefix":
+        if opt[0] == "-p" or opt[0] == "--prefix":
             prefix = opt[1]
         if opt[0] == "-c" or opt[0] == "--os-cloud":
             cloud = opt[1]
diff --git a/playbooks/pre_cloud.yaml b/playbooks/pre_cloud.yaml
index 4d8ba6229..d163674dc 100644
--- a/playbooks/pre_cloud.yaml
+++ b/playbooks/pre_cloud.yaml
@@ -19,6 +19,5 @@
       no_log: true
 
     - name: Clean up any lingering resources from previous run
-      ansible.builtin.shell: python3 ~/Tests/cleanup.py -c {{ cloud }} -p _scs-
-      failed_when: false
+      ansible.builtin.shell: python3 ~/Tests/cleanup.py -c {{ cloud }} --prefix _scs-
       changed_when: true