diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d990c5..9490fb2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  architect: giantswarm/architect@4.34.1
+  architect: giantswarm/architect@4.35.5
 
 workflows:
   go-build:
@@ -36,12 +36,9 @@ workflows:
             tags:
               only: /^v.*/
 
-      - architect/push-to-docker:
-          name: push-to-quay
-          context: "architect"
-          image: quay.io/giantswarm/heartbeatctl
-          username_envar: QUAY_USERNAME
-          password_envar: QUAY_PASSWORD
+      - architect/push-to-registries:
+          context: architect
+          name: push-to-registries
           requires:
             - go-build
           filters:
@@ -49,14 +46,3 @@ workflows:
             tags:
               only: /^v.*/
 
-      - architect/push-to-docker:
-          name: push-to-docker
-          context: "architect"
-          image: "docker.io/giantswarm/heartbeatctl"
-          username_envar: "DOCKER_USERNAME"
-          password_envar: "DOCKER_PASSWORD"
-          requires:
-            - go-build
-          filters:
-            tags:
-              only: /^v.*/