diff --git a/.drone.yml b/.drone.yml
index 5641d25..3f1aa38 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,8 +34,10 @@ steps:
     ref:
     - refs/heads/master
     - refs/tags/**
+  depends_on:
+  - dryrun
 
-- name: publish
+- name: publish-dockerhub
   image: plugins/docker
   settings:
     build_args:
@@ -50,6 +52,27 @@ steps:
     ref:
     - refs/heads/master
     - refs/tags/**
+  depends_on:
+  - tags
+
+- name: publish-quay
+  image: plugins/docker
+  settings:
+    build_args:
+    - BUILD_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
+    password:
+      from_secret: quay_password
+    registry: quay.io
+    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+    username:
+      from_secret: quay_username
+  when:
+    ref:
+    - refs/heads/master
+    - refs/tags/**
+  depends_on:
+  - tags
 
 - name: publish-gitea
   image: plugins/gitea-release
@@ -63,6 +86,9 @@ steps:
   when:
     ref:
     - refs/tags/**
+  depends_on:
+  - publish-dockerhub
+  - publish-quay
 
 ---
 kind: pipeline
@@ -73,17 +99,29 @@ platform:
   arch: amd64
 
 steps:
-- name: readme
-  image: sheogorath/readme-to-dockerhub
+- name: pushrm-dockerhub
+  pull: always
+  image: chko/docker-pushrm:1
   environment:
-    DOCKERHUB_PASSWORD:
+    DOCKER_PASS:
       from_secret: docker_password
-    DOCKERHUB_REPO_NAME: ${DRONE_REPO_NAME}
-    DOCKERHUB_REPO_PREFIX: xoxys
-    DOCKERHUB_USERNAME:
+    DOCKER_USER:
       from_secret: docker_username
-    README_PATH: README.md
-    SHORT_DESCRIPTION: Molecule - Automated Ansible roles testing
+    PUSHRM_FILE: README.md
+    PUSHRM_SHORT: Molecule - Automated Ansible roles testing
+    PUSHRM_TARGET: xoxys/${DRONE_REPO_NAME}
+  when:
+    status:
+    - success
+
+- name: pushrm-quay
+  pull: always
+  image: chko/docker-pushrm:1
+  environment:
+    APIKEY__QUAY_IO:
+      from_secret: quay_token
+    PUSHRM_FILE: README.md
+    PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
   when:
     status:
     - success
@@ -118,6 +156,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 481cc5c3443cd199617fc9418ffbe01ed478aafa8340d382f9f6e011a1c44671
+hmac: 72a2d577e833ea479199c777d2f84137fda1e52d86d11b44206d8a370d0d94ae
 
 ...
diff --git a/README.md b/README.md
index 452806b..e7c5d36 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
-# [molecule](https://gitea.rknet.org/docker/molecule)
+# molecule
+
+Molecule - Automated Ansible roles testing
 
 [![Build Status](https://img.shields.io/drone/build/docker/molecule?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/molecule)
 [![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/xoxys/molecule)
+[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/molecule)
+[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/molecule)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/molecule/src/branch/master/LICENSE)
 
 Docker image to automate Ansible deployment tests with Molecule. The image was build to use with any docker based CI system.