diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7c074f..f852a1f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,44 +1,27 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@4.35.1
-
-jobs:
-  build:
-    executor: architect/architect
-    environment:
-      DOCKER_BUILDKIT: "1"
-
-    steps:
-      - checkout
-
-      - setup_remote_docker:
-          version: 20.10.11
-      
-      - architect/push-to-docker:
-          image: quay.io/giantswarm/docs-proxy
-          tag-latest-branch: main
-          username_envar: QUAY_USERNAME
-          password_envar: QUAY_PASSWORD
+  architect: giantswarm/architect@4.35.5
 
 workflows:
-  package-and-push-chart-on-tag:
+  build-workflow:
     jobs:
-      - build:
+      - architect/push-to-registries:
           context: architect
-          filters:  # required since `architect/push-to-app-catalog` has tag filters AND requires `build`
+          name: push-to-registries
+          filters:
             tags:
               only: /.*/
 
       - architect/push-to-app-catalog:
-          name: package and push
+          name: push-to-app-catalog
           context: architect
           app_catalog: giantswarm-operations-platform-catalog
           app_catalog_test: giantswarm-operations-platform-test-catalog
           chart: docs-proxy-app
+          requires:
+            - push-to-registries
           # Trigger job on git tag.
           filters:
             tags:
               only: /^v.*/
-          requires:
-            - build