diff --git a/test/conformance/kuttl/autogen/deployment-statefulset-job/01-policy.yaml b/test/conformance/kuttl/autogen/deployment-statefulset-job/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/deployment-statefulset-job/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/deployment-statefulset-job/02-errors.yaml b/test/conformance/kuttl/autogen/deployment-statefulset-job/02-errors.yaml
deleted file mode 100644
index 716a335e1b..0000000000
--- a/test/conformance/kuttl/autogen/deployment-statefulset-job/02-errors.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: disallow-latest-tag
-spec:
-  validationFailureAction: audit
-  rules:
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: require-image-tag
-    validate:
-      message: An image tag is required.
-      pattern:
-        spec:
-          containers:
-          - image: '*:*'
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: validate-image-tag
-    validate:
-      message: Using a mutable image tag e.g. 'latest' is not allowed.
-      pattern:
-        spec:
-          containers:
-          - image: '!*:latest'
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready
-  autogen:
-    rules:
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-      name: autogen-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-      name: autogen-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '!*:latest'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '!*:latest'
diff --git a/test/conformance/kuttl/autogen/deployment-statefulset-job/99-cleanup.yaml b/test/conformance/kuttl/autogen/deployment-statefulset-job/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/deployment-statefulset-job/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/deployment-statefulset-job/01-assert.yaml b/test/conformance/kuttl/autogen/deployment-statefulset-job/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/deployment-statefulset-job/01-assert.yaml
rename to test/conformance/kuttl/autogen/deployment-statefulset-job/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/deployment-statefulset-job/01-manifests.yaml b/test/conformance/kuttl/autogen/deployment-statefulset-job/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/deployment-statefulset-job/01-manifests.yaml
rename to test/conformance/kuttl/autogen/deployment-statefulset-job/policy.yaml
diff --git a/test/conformance/kuttl/autogen/none/01-policy.yaml b/test/conformance/kuttl/autogen/none/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/none/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/none/02-errors.yaml b/test/conformance/kuttl/autogen/none/02-errors.yaml
deleted file mode 100644
index ebcf018dd5..0000000000
--- a/test/conformance/kuttl/autogen/none/02-errors.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: disallow-latest-tag
-spec:
-  validationFailureAction: audit
-  rules:
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: require-image-tag
-    validate:
-      message: An image tag is required.
-      pattern:
-        spec:
-          containers:
-          - image: '*:*'
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: validate-image-tag
-    validate:
-      message: Using a mutable image tag e.g. 'latest' is not allowed.
-      pattern:
-        spec:
-          containers:
-          - image: '!*:latest'
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready
-  autogen:
-    rules:
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '!*:latest'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '!*:latest'
diff --git a/test/conformance/kuttl/autogen/none/99-cleanup.yaml b/test/conformance/kuttl/autogen/none/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/none/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/none/01-assert.yaml b/test/conformance/kuttl/autogen/none/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/none/01-assert.yaml
rename to test/conformance/kuttl/autogen/none/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/none/01-manifests.yaml b/test/conformance/kuttl/autogen/none/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/none/01-manifests.yaml
rename to test/conformance/kuttl/autogen/none/policy.yaml
diff --git a/test/conformance/kuttl/autogen/only-cronjob/01-policy.yaml b/test/conformance/kuttl/autogen/only-cronjob/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/only-cronjob/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/only-cronjob/02-errors.yaml b/test/conformance/kuttl/autogen/only-cronjob/02-errors.yaml
deleted file mode 100644
index ebcf018dd5..0000000000
--- a/test/conformance/kuttl/autogen/only-cronjob/02-errors.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: disallow-latest-tag
-spec:
-  validationFailureAction: audit
-  rules:
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: require-image-tag
-    validate:
-      message: An image tag is required.
-      pattern:
-        spec:
-          containers:
-          - image: '*:*'
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: validate-image-tag
-    validate:
-      message: Using a mutable image tag e.g. 'latest' is not allowed.
-      pattern:
-        spec:
-          containers:
-          - image: '!*:latest'
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready
-  autogen:
-    rules:
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '!*:latest'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '!*:latest'
diff --git a/test/conformance/kuttl/autogen/only-cronjob/99-cleanup.yaml b/test/conformance/kuttl/autogen/only-cronjob/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/only-cronjob/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/only-cronjob/01-assert.yaml b/test/conformance/kuttl/autogen/only-cronjob/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/only-cronjob/01-assert.yaml
rename to test/conformance/kuttl/autogen/only-cronjob/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/only-cronjob/01-manifests.yaml b/test/conformance/kuttl/autogen/only-cronjob/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/only-cronjob/01-manifests.yaml
rename to test/conformance/kuttl/autogen/only-cronjob/policy.yaml
diff --git a/test/conformance/kuttl/autogen/only-deployment/01-policy.yaml b/test/conformance/kuttl/autogen/only-deployment/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/only-deployment/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/only-deployment/02-errors.yaml b/test/conformance/kuttl/autogen/only-deployment/02-errors.yaml
deleted file mode 100644
index ebcf018dd5..0000000000
--- a/test/conformance/kuttl/autogen/only-deployment/02-errors.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: disallow-latest-tag
-spec:
-  validationFailureAction: audit
-  rules:
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: require-image-tag
-    validate:
-      message: An image tag is required.
-      pattern:
-        spec:
-          containers:
-          - image: '*:*'
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: validate-image-tag
-    validate:
-      message: Using a mutable image tag e.g. 'latest' is not allowed.
-      pattern:
-        spec:
-          containers:
-          - image: '!*:latest'
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready
-  autogen:
-    rules:
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '!*:latest'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '!*:latest'
diff --git a/test/conformance/kuttl/autogen/only-deployment/99-cleanup.yaml b/test/conformance/kuttl/autogen/only-deployment/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/only-deployment/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/only-deployment/01-assert.yaml b/test/conformance/kuttl/autogen/only-deployment/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/only-deployment/01-assert.yaml
rename to test/conformance/kuttl/autogen/only-deployment/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/only-deployment/01-manifests.yaml b/test/conformance/kuttl/autogen/only-deployment/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/only-deployment/01-manifests.yaml
rename to test/conformance/kuttl/autogen/only-deployment/policy.yaml
diff --git a/test/conformance/kuttl/autogen/should-autogen/01-policy.yaml b/test/conformance/kuttl/autogen/should-autogen/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/should-autogen/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/should-autogen/99-cleanup.yaml b/test/conformance/kuttl/autogen/should-autogen/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/should-autogen/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/should-autogen/01-assert.yaml b/test/conformance/kuttl/autogen/should-autogen/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/should-autogen/01-assert.yaml
rename to test/conformance/kuttl/autogen/should-autogen/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/should-autogen/01-manifests.yaml b/test/conformance/kuttl/autogen/should-autogen/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/should-autogen/01-manifests.yaml
rename to test/conformance/kuttl/autogen/should-autogen/policy.yaml
diff --git a/test/conformance/kuttl/autogen/should-not-autogen/01-policy.yaml b/test/conformance/kuttl/autogen/should-not-autogen/01-policy.yaml
new file mode 100644
index 0000000000..b088ed7601
--- /dev/null
+++ b/test/conformance/kuttl/autogen/should-not-autogen/01-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/should-not-autogen/02-errors.yaml b/test/conformance/kuttl/autogen/should-not-autogen/02-errors.yaml
deleted file mode 100644
index ebcf018dd5..0000000000
--- a/test/conformance/kuttl/autogen/should-not-autogen/02-errors.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: disallow-latest-tag
-spec:
-  validationFailureAction: audit
-  rules:
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: require-image-tag
-    validate:
-      message: An image tag is required.
-      pattern:
-        spec:
-          containers:
-          - image: '*:*'
-  - match:
-      resources:
-        kinds:
-        - Pod
-    name: validate-image-tag
-    validate:
-      message: Using a mutable image tag e.g. 'latest' is not allowed.
-      pattern:
-        spec:
-          containers:
-          - image: '!*:latest'
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready
-  autogen:
-    rules:
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-require-image-tag
-      validate:
-        message: An image tag is required.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '*:*'
-    - match:
-        resources:
-          kinds:
-          - DaemonSet
-          - Deployment
-          - Job
-          - StatefulSet
-      name: autogen-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            template:
-              spec:
-                containers:
-                - image: '!*:latest'
-    - match:
-        resources:
-          kinds:
-          - CronJob
-      name: autogen-cronjob-validate-image-tag
-      validate:
-        message: Using a mutable image tag e.g. 'latest' is not allowed.
-        pattern:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                    - image: '!*:latest'
diff --git a/test/conformance/kuttl/autogen/should-not-autogen/99-cleanup.yaml b/test/conformance/kuttl/autogen/should-not-autogen/99-cleanup.yaml
deleted file mode 100644
index 15c3c49051..0000000000
--- a/test/conformance/kuttl/autogen/should-not-autogen/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/autogen/should-not-autogen/01-assert.yaml b/test/conformance/kuttl/autogen/should-not-autogen/policy-assert.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/should-not-autogen/01-assert.yaml
rename to test/conformance/kuttl/autogen/should-not-autogen/policy-assert.yaml
diff --git a/test/conformance/kuttl/autogen/should-not-autogen/01-manifests.yaml b/test/conformance/kuttl/autogen/should-not-autogen/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/autogen/should-not-autogen/01-manifests.yaml
rename to test/conformance/kuttl/autogen/should-not-autogen/policy.yaml