diff --git a/.drone.yml b/.drone.yml
index c9f2590..69f3908 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -69,52 +69,25 @@ steps:
   - name: push
     image: quay.io/buildah/stable
     privileged: true
-    volumes:
-    - name: fedhq-ca-crt
-      path: /etc/ssl/certs2/
-    commands:
-      - scripts/setupEnvironment.sh
-      - buildah manifest create registry.cloud.federationhq.de/fhem:latest registry.cloud.federationhq.de/fhem:latest-arm64 registry.cloud.federationhq.de/fhem:latest-amd64
-      - buildah manifest push registry.cloud.federationhq.de/fhem:latest docker://registry.cloud.federationhq.de/fhem:latest 
-depends_on:
-  - build-amd64
-  - build-arm64
-
-
----
-kind: pipeline
-type: kubernetes
-name: push-docker-hub
-node_selector:
-  kubernetes.io/arch: amd64
-       
-volumes:
-- name: fedhq-ca-crt
-  config_map:
-    name: fedhq-ca-crt
-    default_mode: 420     # same as 644 in octal, or u+w,a+r
-    optional: false
-
-steps:
-  - name: push
-    image: quay.io/buildah/stable
     environment:
       USERNAME:
         from_secret: username
       PASSWORD:
         from_secret: password
-    privileged: true
     volumes:
     - name: fedhq-ca-crt
       path: /etc/ssl/certs2/
     commands:
       - scripts/setupEnvironment.sh
-      - buildah login -u $${USERNAME} -p $${PASSWORD} docker.com
-      - buildah manifest create docker.com/byterazor/fhem:latest registry.cloud.federationhq.de/fhem:latest-arm64 registry.cloud.federationhq.de/fhem:latest-amd64
-      - buildah manifest push --all docker.com/byterazor/fhem:latest 
-      - buildah manifest rm docker.com/byterazor/fhem:latest
+      - buildah manifest create fhem:latest registry.cloud.federationhq.de/fhem:latest-arm64 registry.cloud.federationhq.de/fhem:latest-amd64
+      - buildah manifest push --all fhem:latest docker://registry.cloud.federationhq.de/fhem:latest
+      - buildah login -u $${USERNAME} -p $${PASSWORD} registry.hub.docker.com
+      - buildah manifest push --all fhem:latest docker://registry.hub.docker.com/byterazor/fhem:latest 
+      - buildah manifest fhem:latest
+
 depends_on:
-  - push
+  - build-amd64
+  - build-arm64
 
 ---
 kind: secret