diff --git a/buildall b/buildall
index f10b437..023cb83 100755
--- a/buildall
+++ b/buildall
@@ -40,6 +40,7 @@ LATEST=jessie
 
 BASENAME=bitnami/minideb
 GCR_BASENAME=gcr.io/bitnami-containers/minideb
+QUAY_BASENAME=quay.io/bitnami/minideb
 
 mkdir -p build
 
@@ -90,8 +91,10 @@ for DIST in $DISTS; do
        fi
    fi
    docker tag $built_image_id $BASENAME:$DIST
+   docker tag $built_image_id $QUAY_BASENAME:$DIST
    docker tag $built_image_id $GCR_BASENAME:$DIST
-   log "Tagged $built_image_id as $BASENAME:$DIST $GCR_BASENAME:$DIST"
+   log "Tagged $built_image_id as $BASENAME:$DIST $QUAY_BASENAME:$DIST $GCR_BASENAME:$DIST"
 done
 docker tag $BASENAME:$LATEST $BASENAME:latest
+docker tag $QUAY_BASENAME:$LATEST $QUAY_BASENAME:latest
 docker tag $GCR_BASENAME:$LATEST $GCR_BASENAME:latest
diff --git a/pushall b/pushall
index 0a09478..760186b 100755
--- a/pushall
+++ b/pushall
@@ -11,16 +11,22 @@ latest
 
 BASENAME=bitnami/minideb
 GCR_BASENAME=gcr.io/bitnami-containers/minideb
+QUAY_BASENAME=quay.io/bitnami/minideb
 
 if [ -n "${DOCKER_PASSWORD:-}" ]; then
     docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 fi
 
+if [ -n "${QUAY_PASSWORD:-}" ]; then
+  docker login -e $QUAY_EMAIL -u $QUAY_USERNAME -p $QUAY_PASSWORD
+fi
+
 if [ -n "${GCR_KEY:-}" ]; then
     gcloud auth activate-service-account $GCR_EMAIL --key-file <(echo "$GCR_KEY")
 fi
 
 for DIST in $DISTS; do
     docker push $BASENAME:$DIST
+    docker push $QUAY_BASENAME:$DIST
     gcloud docker push $GCR_BASENAME:$DIST
 done