diff --git a/testing/kuttl/e2e/backup/00--cluster.yaml b/testing/kuttl/e2e/backup/00-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/00--cluster.yaml
rename to testing/kuttl/e2e/backup/00-cluster.yaml
diff --git a/testing/kuttl/e2e/backup/01--check-pod-command.yaml b/testing/kuttl/e2e/backup/01-check-pod-command.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/01--check-pod-command.yaml
rename to testing/kuttl/e2e/backup/01-check-pod-command.yaml
diff --git a/testing/kuttl/e2e/backup/02--backup-with-flags.yaml b/testing/kuttl/e2e/backup/02-backup-with-flags.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/02--backup-with-flags.yaml
rename to testing/kuttl/e2e/backup/02-backup-with-flags.yaml
diff --git a/testing/kuttl/e2e/backup/03--check-pod-command-with-flags.yaml b/testing/kuttl/e2e/backup/03-check-pod-command-with-flags.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/03--check-pod-command-with-flags.yaml
rename to testing/kuttl/e2e/backup/03-check-pod-command-with-flags.yaml
diff --git a/testing/kuttl/e2e/backup/04--backup-with-longer-option.yaml b/testing/kuttl/e2e/backup/04-backup-with-longer-option.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/04--backup-with-longer-option.yaml
rename to testing/kuttl/e2e/backup/04-backup-with-longer-option.yaml
diff --git a/testing/kuttl/e2e/backup/05--check-pod-command-with-longer-options.yaml b/testing/kuttl/e2e/backup/05-check-pod-command-with-longer-options.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/05--check-pod-command-with-longer-options.yaml
rename to testing/kuttl/e2e/backup/05-check-pod-command-with-longer-options.yaml
diff --git a/testing/kuttl/e2e/backup/06--backup-with-multiple-flags.yaml b/testing/kuttl/e2e/backup/06-backup-with-multiple-flags.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/06--backup-with-multiple-flags.yaml
rename to testing/kuttl/e2e/backup/06-backup-with-multiple-flags.yaml
diff --git a/testing/kuttl/e2e/backup/07--check-pod-command-with-multiple-flags.yaml b/testing/kuttl/e2e/backup/07-check-pod-command-with-multiple-flags.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/07--check-pod-command-with-multiple-flags.yaml
rename to testing/kuttl/e2e/backup/07-check-pod-command-with-multiple-flags.yaml
diff --git a/testing/kuttl/e2e/backup/08--backup-with-just-trigger.yaml b/testing/kuttl/e2e/backup/08-backup-with-just-trigger.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/08--backup-with-just-trigger.yaml
rename to testing/kuttl/e2e/backup/08-backup-with-just-trigger.yaml
diff --git a/testing/kuttl/e2e/backup/10--update-cluster.yaml b/testing/kuttl/e2e/backup/10-update-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/10--update-cluster.yaml
rename to testing/kuttl/e2e/backup/10-update-cluster.yaml
diff --git a/testing/kuttl/e2e/backup/11--backup-with-new-flag.yaml b/testing/kuttl/e2e/backup/11-backup-with-new-flag.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/11--backup-with-new-flag.yaml
rename to testing/kuttl/e2e/backup/11-backup-with-new-flag.yaml
diff --git a/testing/kuttl/e2e/backup/12--backup-with-force-conflicts.yaml b/testing/kuttl/e2e/backup/12-backup-with-force-conflicts.yaml
similarity index 100%
rename from testing/kuttl/e2e/backup/12--backup-with-force-conflicts.yaml
rename to testing/kuttl/e2e/backup/12-backup-with-force-conflicts.yaml
diff --git a/testing/kuttl/e2e/create-without-backups/00--create_cluster.yaml b/testing/kuttl/e2e/create-without-backups/00-create_cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/create-without-backups/00--create_cluster.yaml
rename to testing/kuttl/e2e/create-without-backups/00-create_cluster.yaml
diff --git a/testing/kuttl/e2e/create-without-backups/01--create_cluster.yaml b/testing/kuttl/e2e/create-without-backups/01-create_cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/create-without-backups/01--create_cluster.yaml
rename to testing/kuttl/e2e/create-without-backups/01-create_cluster.yaml
diff --git a/testing/kuttl/e2e/create/00--create_cluster.yaml b/testing/kuttl/e2e/create/00-create_cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/create/00--create_cluster.yaml
rename to testing/kuttl/e2e/create/00-create_cluster.yaml
diff --git a/testing/kuttl/e2e/create/01--check_version_validation.yaml b/testing/kuttl/e2e/create/01-check_version_validation.yaml
similarity index 100%
rename from testing/kuttl/e2e/create/01--check_version_validation.yaml
rename to testing/kuttl/e2e/create/01-check_version_validation.yaml
diff --git a/testing/kuttl/e2e/delete-cluster/00--cluster.yaml b/testing/kuttl/e2e/delete-cluster/00-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/delete-cluster/00--cluster.yaml
rename to testing/kuttl/e2e/delete-cluster/00-cluster.yaml
diff --git a/testing/kuttl/e2e/delete-cluster/01--delete-cluster-no.yaml b/testing/kuttl/e2e/delete-cluster/01-delete-cluster-no.yaml
similarity index 100%
rename from testing/kuttl/e2e/delete-cluster/01--delete-cluster-no.yaml
rename to testing/kuttl/e2e/delete-cluster/01-delete-cluster-no.yaml
diff --git a/testing/kuttl/e2e/delete-cluster/02--delete-cluster-yes.yaml b/testing/kuttl/e2e/delete-cluster/02-delete-cluster-yes.yaml
similarity index 100%
rename from testing/kuttl/e2e/delete-cluster/02--delete-cluster-yes.yaml
rename to testing/kuttl/e2e/delete-cluster/02-delete-cluster-yes.yaml
diff --git a/testing/kuttl/e2e/delete-cluster/04--delete-fake-cluster.yaml b/testing/kuttl/e2e/delete-cluster/04-delete-fake-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/delete-cluster/04--delete-fake-cluster.yaml
rename to testing/kuttl/e2e/delete-cluster/04-delete-fake-cluster.yaml
diff --git a/testing/kuttl/e2e/restore/00--cluster.yaml b/testing/kuttl/e2e/restore/00-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/00--cluster.yaml
rename to testing/kuttl/e2e/restore/00-cluster.yaml
diff --git a/testing/kuttl/e2e/restore/01--validation.yaml b/testing/kuttl/e2e/restore/01-validation.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/01--validation.yaml
rename to testing/kuttl/e2e/restore/01-validation.yaml
diff --git a/testing/kuttl/e2e/restore/11--restore-latest-no.yaml b/testing/kuttl/e2e/restore/11-restore-latest-no.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/11--restore-latest-no.yaml
rename to testing/kuttl/e2e/restore/11-restore-latest-no.yaml
diff --git a/testing/kuttl/e2e/restore/12--restore-latest-yes.yaml b/testing/kuttl/e2e/restore/12-restore-latest-yes.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/12--restore-latest-yes.yaml
rename to testing/kuttl/e2e/restore/12-restore-latest-yes.yaml
diff --git a/testing/kuttl/e2e/restore/13--restore-specific.yaml b/testing/kuttl/e2e/restore/13-restore-specific.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/13--restore-specific.yaml
rename to testing/kuttl/e2e/restore/13-restore-specific.yaml
diff --git a/testing/kuttl/e2e/restore/14--disable-restores.yaml b/testing/kuttl/e2e/restore/14-disable-restores.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/14--disable-restores.yaml
rename to testing/kuttl/e2e/restore/14-disable-restores.yaml
diff --git a/testing/kuttl/e2e/restore/20--predefined-settings.yaml b/testing/kuttl/e2e/restore/20-predefined-settings.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/20--predefined-settings.yaml
rename to testing/kuttl/e2e/restore/20-predefined-settings.yaml
diff --git a/testing/kuttl/e2e/restore/30--conflict.yaml b/testing/kuttl/e2e/restore/30-conflict.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/30--conflict.yaml
rename to testing/kuttl/e2e/restore/30-conflict.yaml
diff --git a/testing/kuttl/e2e/restore/31--force-conflicts.yaml b/testing/kuttl/e2e/restore/31-force-conflicts.yaml
similarity index 100%
rename from testing/kuttl/e2e/restore/31--force-conflicts.yaml
rename to testing/kuttl/e2e/restore/31-force-conflicts.yaml
diff --git a/testing/kuttl/e2e/show/00--cluster.yaml b/testing/kuttl/e2e/show/00-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/00--cluster.yaml
rename to testing/kuttl/e2e/show/00-cluster.yaml
diff --git a/testing/kuttl/e2e/show/01--pgbackrest-info.yaml b/testing/kuttl/e2e/show/01-pgbackrest-info.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/01--pgbackrest-info.yaml
rename to testing/kuttl/e2e/show/01-pgbackrest-info.yaml
diff --git a/testing/kuttl/e2e/show/02--pgbackrest-info-repo1.yaml b/testing/kuttl/e2e/show/02-pgbackrest-info-repo1.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/02--pgbackrest-info-repo1.yaml
rename to testing/kuttl/e2e/show/02-pgbackrest-info-repo1.yaml
diff --git a/testing/kuttl/e2e/show/03--pgbackrest-info-output.yaml b/testing/kuttl/e2e/show/03-pgbackrest-info-output.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/03--pgbackrest-info-output.yaml
rename to testing/kuttl/e2e/show/03-pgbackrest-info-output.yaml
diff --git a/testing/kuttl/e2e/show/04--pgbackrest-info-bad-format.yaml b/testing/kuttl/e2e/show/04-pgbackrest-info-bad-format.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/04--pgbackrest-info-bad-format.yaml
rename to testing/kuttl/e2e/show/04-pgbackrest-info-bad-format.yaml
diff --git a/testing/kuttl/e2e/show/05--patronictl-list.yaml b/testing/kuttl/e2e/show/05-patronictl-list.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/05--patronictl-list.yaml
rename to testing/kuttl/e2e/show/05-patronictl-list.yaml
diff --git a/testing/kuttl/e2e/show/06--patronictl-list-json.yaml b/testing/kuttl/e2e/show/06-patronictl-list-json.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/06--patronictl-list-json.yaml
rename to testing/kuttl/e2e/show/06-patronictl-list-json.yaml
diff --git a/testing/kuttl/e2e/show/07--patronictl-list-bad-format.yaml b/testing/kuttl/e2e/show/07-patronictl-list-bad-format.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/07--patronictl-list-bad-format.yaml
rename to testing/kuttl/e2e/show/07-patronictl-list-bad-format.yaml
diff --git a/testing/kuttl/e2e/show/08--show-user.yaml b/testing/kuttl/e2e/show/08-show-user.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/08--show-user.yaml
rename to testing/kuttl/e2e/show/08-show-user.yaml
diff --git a/testing/kuttl/e2e/show/09--combined-show.yaml b/testing/kuttl/e2e/show/09-combined-show.yaml
similarity index 100%
rename from testing/kuttl/e2e/show/09--combined-show.yaml
rename to testing/kuttl/e2e/show/09-combined-show.yaml
diff --git a/testing/kuttl/e2e/start-stop/00--cluster.yaml b/testing/kuttl/e2e/start-stop/00-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/start-stop/00--cluster.yaml
rename to testing/kuttl/e2e/start-stop/00-cluster.yaml
diff --git a/testing/kuttl/e2e/start-stop/01--stop-cluster-no-with-force-conflicts.yaml b/testing/kuttl/e2e/start-stop/01-stop-cluster-no-with-force-conflicts.yaml
similarity index 100%
rename from testing/kuttl/e2e/start-stop/01--stop-cluster-no-with-force-conflicts.yaml
rename to testing/kuttl/e2e/start-stop/01-stop-cluster-no-with-force-conflicts.yaml
diff --git a/testing/kuttl/e2e/start-stop/02--stop-cluster-yes-with-force-conflicts.yaml b/testing/kuttl/e2e/start-stop/02-stop-cluster-yes-with-force-conflicts.yaml
similarity index 100%
rename from testing/kuttl/e2e/start-stop/02--stop-cluster-yes-with-force-conflicts.yaml
rename to testing/kuttl/e2e/start-stop/02-stop-cluster-yes-with-force-conflicts.yaml
diff --git a/testing/kuttl/e2e/start-stop/03--start-cluster.yaml b/testing/kuttl/e2e/start-stop/03-start-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/start-stop/03--start-cluster.yaml
rename to testing/kuttl/e2e/start-stop/03-start-cluster.yaml
diff --git a/testing/kuttl/e2e/start-stop/04--start-a-started-cluster.yaml b/testing/kuttl/e2e/start-stop/04-start-a-started-cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/start-stop/04--start-a-started-cluster.yaml
rename to testing/kuttl/e2e/start-stop/04-start-a-started-cluster.yaml
diff --git a/testing/kuttl/e2e/support-export/00--create_cluster.yaml b/testing/kuttl/e2e/support-export/00-create_cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/00--create_cluster.yaml
rename to testing/kuttl/e2e/support-export/00-create_cluster.yaml
diff --git a/testing/kuttl/e2e/support-export/01--support_export.yaml b/testing/kuttl/e2e/support-export/01-support_export.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/01--support_export.yaml
rename to testing/kuttl/e2e/support-export/01-support_export.yaml
diff --git a/testing/kuttl/e2e/support-export/10--invalid_cluster.yaml b/testing/kuttl/e2e/support-export/10-invalid_cluster.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/10--invalid_cluster.yaml
rename to testing/kuttl/e2e/support-export/10-invalid_cluster.yaml
diff --git a/testing/kuttl/e2e/support-export/20--create_limitrange_ingress.yaml b/testing/kuttl/e2e/support-export/20-create_limitrange_ingress.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/20--create_limitrange_ingress.yaml
rename to testing/kuttl/e2e/support-export/20-create_limitrange_ingress.yaml
diff --git a/testing/kuttl/e2e/support-export/21--support_export.yaml b/testing/kuttl/e2e/support-export/21-support_export.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/21--support_export.yaml
rename to testing/kuttl/e2e/support-export/21-support_export.yaml
diff --git a/testing/kuttl/e2e/support-export/22--cleanup.yaml b/testing/kuttl/e2e/support-export/22-cleanup.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/22--cleanup.yaml
rename to testing/kuttl/e2e/support-export/22-cleanup.yaml
diff --git a/testing/kuttl/e2e/support-export/30--create_cluster_with_monitoring.yaml b/testing/kuttl/e2e/support-export/30-create_cluster_with_monitoring.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/30--create_cluster_with_monitoring.yaml
rename to testing/kuttl/e2e/support-export/30-create_cluster_with_monitoring.yaml
diff --git a/testing/kuttl/e2e/support-export/31--support_export.yaml b/testing/kuttl/e2e/support-export/31-support_export.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/31--support_export.yaml
rename to testing/kuttl/e2e/support-export/31-support_export.yaml
diff --git a/testing/kuttl/e2e/support-export/32--cleanup.yaml b/testing/kuttl/e2e/support-export/32-cleanup.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/32--cleanup.yaml
rename to testing/kuttl/e2e/support-export/32-cleanup.yaml
diff --git a/testing/kuttl/e2e/support-export/33--create_cluster_with_instrumentation.yaml b/testing/kuttl/e2e/support-export/33-create_cluster_with_instrumentation.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/33--create_cluster_with_instrumentation.yaml
rename to testing/kuttl/e2e/support-export/33-create_cluster_with_instrumentation.yaml
diff --git a/testing/kuttl/e2e/support-export/34--support_export.yaml b/testing/kuttl/e2e/support-export/34-support_export.yaml
similarity index 100%
rename from testing/kuttl/e2e/support-export/34--support_export.yaml
rename to testing/kuttl/e2e/support-export/34-support_export.yaml
diff --git a/testing/kuttl/e2e/version/00--check-version.yaml b/testing/kuttl/e2e/version/00-check-version.yaml
similarity index 100%
rename from testing/kuttl/e2e/version/00--check-version.yaml
rename to testing/kuttl/e2e/version/00-check-version.yaml
diff --git a/testing/kuttl/e2e/version/01--check-client-version.yaml b/testing/kuttl/e2e/version/01-check-client-version.yaml
similarity index 100%
rename from testing/kuttl/e2e/version/01--check-client-version.yaml
rename to testing/kuttl/e2e/version/01-check-client-version.yaml