diff --git a/.github/workflows/yaml_formatter.yaml b/.github/workflows/yaml_formatter.yaml
index afa1b4c1b1..d340756c27 100644
--- a/.github/workflows/yaml_formatter.yaml
+++ b/.github/workflows/yaml_formatter.yaml
@@ -54,7 +54,15 @@ jobs:
       run: cat changed_files_in_PR.txt
 
     - name: Run yamllint on changed files
-      if: steps.changed_files.outputs.changed_files != ''
       run: |
-        cat changed_files_in_PR.txt | xargs -I {} yamllint {} || echo "No changes needed for the YAML files."
+        if [ -s changed_files_in_PR.txt ]; then
+          cat changed_files_in_PR.txt | xargs -I {} yamllint {} || exit 1
+        else
+          echo "No YAML files have changed in this PR."
+        fi
+      shell: bash
+
+    - name: Check YAML lint results
+      if: success()
+      run: echo "No styling issues with YAML files."
       shell: bash
diff --git a/common/cert-manager/cert-manager/base/cert-manager.yaml b/common/cert-manager/cert-manager/base/cert-manager.yaml
index 3cbd60ba80..fbe330d615 100644
--- a/common/cert-manager/cert-manager/base/cert-manager.yaml
+++ b/common/cert-manager/cert-manager/base/cert-manager.yaml
@@ -22,12 +22,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: certificaterequests.cert-manager.io
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.14.5"
+      labels:
+        app: 'cert-manager'
+        app.kubernetes.io/name: 'cert-manager'
+        app.kubernetes.io/instance: 'cert-manager'
+        # Generated labels
+        app.kubernetes.io/version: "v1.14.5"
 spec:
   group: cert-manager.io
   names: