diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6641fe0..f7d1d3a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,141 +7,149 @@ jobs:
   tests:
     executor: architect/architect
     steps:
-      - checkout
-      - run:
-          name: "Run tests"
-          command: CGO_ENABLED=0 make test-all
+    - checkout
+    - run:
+        name: Run tests
+        command: CGO_ENABLED=0 make test-all
 
 workflows:
   build:
     jobs:
-      - tests:
-          filters:
-            tags:
-              only: /^v.*/
-      - architect/go-build:
-          context: architect
-          name: go-build
-          binary: dex-operator
-          resource_class: xlarge
-          filters:
-            tags:
-              only: /^v.*/
-      - architect/push-to-registries:
-          context: architect
-          name: push-to-registries
-          requires:
-            - go-build
-          filters:
+    - tests:
+        filters:
+          tags:
+            only: /^v.*/
+    - architect/go-build:
+        context: architect
+        name: go-build
+        binary: dex-operator
+        resource_class: xlarge
+        filters:
+          tags:
+            only: /^v.*/
+    - architect/push-to-registries:
+        context: architect
+        name: push-to-registries
+        requires:
+        - go-build
+        filters:
             # Trigger the job also on git tag.
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-catalog:
-          context: architect
-          name: push-to-app-catalog
-          app_catalog: "control-plane-catalog"
-          app_catalog_test: "control-plane-test-catalog"
-          chart: "dex-operator"
-          requires:
-            - push-to-registries
-          filters:
+          tags:
+            only: /^v.*/
+          branches:
+            ignore:
+            - main
+            - master
+    - architect/push-to-app-catalog:
+        context: architect
+        name: push-to-app-catalog
+        app_catalog: control-plane-catalog
+        app_catalog_test: control-plane-test-catalog
+        chart: dex-operator
+        requires:
+        - push-to-registries
+        filters:
             # Trigger the job also on git tag.
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-azure-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "azure-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-aws-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "aws-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-kvm-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "kvm-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
+          tags:
+            only: /^v.*/
+          branches:
+            ignore:
+            - main
+            - master
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-azure-app-collection
+        app_name: dex-operator
+        app_collection_repo: azure-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-aws-app-collection
+        app_name: dex-operator
+        app_collection_repo: aws-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-kvm-app-collection
+        app_name: dex-operator
+        app_collection_repo: kvm-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
 
-          name: push-to-capa-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "capa-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-gcp-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "gcp-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-cloud-director-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "cloud-director-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-vsphere-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "vsphere-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - architect/push-to-app-collection:
-          context: architect
-          name: push-to-capz-app-collection
-          app_name: "dex-operator"
-          app_collection_repo: "capz-app-collection"
-          requires:
-            - push-to-app-catalog
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
+        name: push-to-capa-app-collection
+        app_name: dex-operator
+        app_collection_repo: capa-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-gcp-app-collection
+        app_name: dex-operator
+        app_collection_repo: gcp-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-cloud-director-app-collection
+        app_name: dex-operator
+        app_collection_repo: cloud-director-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-vsphere-app-collection
+        app_name: dex-operator
+        app_collection_repo: vsphere-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/
+    - architect/push-to-app-collection:
+        context: architect
+        name: push-to-capz-app-collection
+        app_name: dex-operator
+        app_collection_repo: capz-app-collection
+        requires:
+        - push-to-app-catalog
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /^v.*/