diff --git a/.github/workflows/docker-image-elasticsearch.yml b/.github/workflows/docker-image-elasticsearch.yml
index 181dd5b0..b55f0918 100644
--- a/.github/workflows/docker-image-elasticsearch.yml
+++ b/.github/workflows/docker-image-elasticsearch.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/elasticsearch/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-mailhog.yml b/.github/workflows/docker-image-mailhog.yml
index 9863d262..4017fad0 100644
--- a/.github/workflows/docker-image-mailhog.yml
+++ b/.github/workflows/docker-image-mailhog.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/mailhog/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-mariadb.yml b/.github/workflows/docker-image-mariadb.yml
index 5f5fa6b8..8b4e72c2 100644
--- a/.github/workflows/docker-image-mariadb.yml
+++ b/.github/workflows/docker-image-mariadb.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/mariadb/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-mysql.yml b/.github/workflows/docker-image-mysql.yml
index 79530bb5..83e0e1e7 100644
--- a/.github/workflows/docker-image-mysql.yml
+++ b/.github/workflows/docker-image-mysql.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/mysql/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-nginx.yml b/.github/workflows/docker-image-nginx.yml
index 85d2e7bc..3f21da44 100644
--- a/.github/workflows/docker-image-nginx.yml
+++ b/.github/workflows/docker-image-nginx.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/nginx/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-php-fpm.yml b/.github/workflows/docker-image-php-fpm.yml
index 93853ccf..f74913de 100644
--- a/.github/workflows/docker-image-php-fpm.yml
+++ b/.github/workflows/docker-image-php-fpm.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/php-fpm/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-rabbitmq.yml b/.github/workflows/docker-image-rabbitmq.yml
index 9cc8082c..2d29932c 100644
--- a/.github/workflows/docker-image-rabbitmq.yml
+++ b/.github/workflows/docker-image-rabbitmq.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/rabbitmq/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-redis.yml b/.github/workflows/docker-image-redis.yml
index f5d27f7f..1f1ad26e 100644
--- a/.github/workflows/docker-image-redis.yml
+++ b/.github/workflows/docker-image-redis.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/redis/**
     branches:
     - develop
diff --git a/.github/workflows/docker-image-varnish.yml b/.github/workflows/docker-image-varnish.yml
index ba27dd81..72816c79 100644
--- a/.github/workflows/docker-image-varnish.yml
+++ b/.github/workflows/docker-image-varnish.yml
@@ -5,6 +5,7 @@ on:
   push:
     paths:
     - version
+    - images/.trigger
     - images/varnish/**
     branches:
     - develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f3c8579..50e0a8bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
 [All Commits](https://github.com/davidalger/warden/compare/0.5.0..develop)
 
+## Version [0.5.1](https://github.com/davidalger/warden/tree/0.5.1) (2020-05-28)
+[All Commits](https://github.com/davidalger/warden/compare/0.5.0..0.5.1)
+
+**Upgrade Notes:**
+
+All docker images have been re-located to a [new Docker Hub organization](https://hub.docker.com/u/wardenenv) created specifically for use with Warden. All built-in environment types having been updated to reference the images on `docker.io/wardenenv` rather than `quay.io/warden`. Images currently on Quay will remain available (for at least the next 90-days) in order to preserve functionality of Warden prior to the 0.5.1 release, but these will no longer be updated and are considered deprecated immediately. Where references to `quay.io/warden` exist in per-project configuration within the `.warden` directory, it is strongly recommended these references be updated to use images from `docker.io/wardenenv`. You can quickly check an environment's configuration for references to images on Quay via the following command:
+
+```
+warden env config | grep quay.io
+```
+
+The backstory, and reason for moving the images, is that in Warden 0.2.0 (circa January 2020) images were relocated from a single Docker Hub repository to individual repositories on Quay.io both as a means of breaking down a mon-repo and also to leverage images scanning of Quay.io. Since that time, Quay.io has had multiple outages, including a recent one which lasted for 19 hours with intermittent inability to pull images as even read-only operations were failing as the service failed to be scaled. This morning [Quay.io is down yet again](https://github.com/davidalger/warden/issues/157), prompting all-out inability to pull images. Given the saddening instability of Quay.io and the inability to [setup a local mirror as you can with Docker Hub](https://docs.docker.com/registry/recipes/mirror/) it has become painstakingly obvious that the images must be moved back to Docker Hub for a long-term and stable home, with the added benefit that you will now be able to use a local registry service as a pass-through mirror for reducing network bandwidth and/or ensuring you have a copy of all images local to your network should at any time Docker Hub encounter issues in the future.
+
+The new long-term home for Warden docker images can be found here at [https://hub.docker.com/u/wardenenv](https://hub.docker.com/u/wardenenv).
+
+**Change Summary:**
+
+* Updated images to reside in the `docker.io/wardenenv` registry on [Docker Hub](https://hub.docker.com/u/wardenenv)
+* Removed usages of images previously on `quay.io/warden`
+* Deprecated images on `quay.io/warden` for planned removal at some point in the future (to be not less than 90-days from today)
+
 ## Version [0.5.0](https://github.com/davidalger/warden/tree/0.5.0) (2020-05-21)
 [All Commits](https://github.com/davidalger/warden/compare/0.4.4..0.5.0)
 
@@ -200,7 +221,7 @@ Please reference the updated [base environment definitions](https://github.com/d
 
 Environments referencing `laravel.conf` in custom configuration within `.warden` directory must update their configuration to reference the generic `application.conf` instead as the file was renamed in the Nginx image for re-use in the future on additional environment types.
 
-Docker images have all been re-located and/or mirrored to Quay with all built-in environment types having been updated to reference the images at the new location. Images currently on Docker Hub will remain available in order to preserve functionality of Warden 0.1.x release line, but will no longer be updated and compatibility with all functionality in Warden 0.2.0 is not guaranteed. Where these images are referenced in per-project configuration within the `.warden` directory, it is strongly suggested these references be updated to use images at the new locations:
+Docker images have all been re-located and/or mirrored to Quay with all built-in environment types having been updated to reference the images at the new location. Images currently on Docker Hub will remain available in order to preserve functionality of Warden 0.1.x release line *(**UPDATE** These images have been removed as of May 28th, 2020)*, but will no longer be updated and compatibility with all functionality in Warden 0.2.0 is not guaranteed. Where these images are referenced in per-project configuration within the `.warden` directory, it is strongly suggested these references be updated to use images at the new locations:
 
 * [https://quay.io/repository/warden/varnish?tab=tags](https://quay.io/repository/warden/varnish?tab=tags)
 * [https://quay.io/repository/warden/redis?tab=tags](https://quay.io/repository/warden/redis?tab=tags)
diff --git a/docs/images.md b/docs/images.md
index eb83fc03..4ae8df0e 100644
--- a/docs/images.md
+++ b/docs/images.md
@@ -1,15 +1,3 @@
 ## Docker Images
 
-Each of the docker images used by Warden environments are published on Quay: [https://quay.io/warden](https://quay.io/warden). Source files used to build these images may be found in the `images` directory of the main project repository. Github Actions are used to automatically build and push new images to Quay when image sources are modified.
-
-Please reference the following pages for a list of available image versions:
-
-* [https://quay.io/repository/warden/varnish?tab=tags](https://quay.io/repository/warden/varnish?tab=tags)
-* [https://quay.io/repository/warden/redis?tab=tags](https://quay.io/repository/warden/redis?tab=tags)
-* [https://quay.io/repository/warden/rabbitmq?tab=tags](https://quay.io/repository/warden/rabbitmq?tab=tags)
-* [https://quay.io/repository/warden/php-fpm?tab=tags](https://quay.io/repository/warden/php-fpm?tab=tags)
-* [https://quay.io/repository/warden/nginx?tab=tags](https://quay.io/repository/warden/nginx?tab=tags)
-* [https://quay.io/repository/warden/mariadb?tab=tags](https://quay.io/repository/warden/mariadb?tab=tags)
-* [https://quay.io/repository/warden/mysql?tab=tags](https://quay.io/repository/warden/mysql?tab=tags)
-* [https://quay.io/repository/warden/mailhog?tab=tags](https://quay.io/repository/warden/mailhog?tab=tags)
-* [https://quay.io/repository/warden/elasticsearch?tab=tags](https://quay.io/repository/warden/elasticsearch?tab=tags)
+Each of the docker images used by Warden environments are published on Docker Hub: [https://hub.docker.com/u/wardenenv](https://hub.docker.com/u/wardenenv). Source files used to build these images may be found in the `images` directory of the main project repository. Github Actions are used to automatically build and push new images to Docker Hub when image sources are modified. Please refer to the repositories on Docker Hub for a list of available image versions and tags.
diff --git a/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml
index 95c9e157..7438161a 100644
--- a/environments/includes/blackfire.base.yml
+++ b/environments/includes/blackfire.base.yml
@@ -11,7 +11,7 @@ x-extra_hosts: &extra_hosts
 services:
   php-blackfire:
     hostname: "${WARDEN_ENV_NAME}-php-blackfire"
-    image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}-blackfire
+    image: docker.io/wardenenv/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}-blackfire
     environment:
       - TRAEFIK_DOMAIN
       - TRAEFIK_SUBDOMAIN
diff --git a/environments/includes/elasticsearch.base.yml b/environments/includes/elasticsearch.base.yml
index 538f89c4..2810a8df 100644
--- a/environments/includes/elasticsearch.base.yml
+++ b/environments/includes/elasticsearch.base.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   elasticsearch:
     hostname: "${WARDEN_ENV_NAME}-elasticsearch"
-    image: quay.io/warden/elasticsearch:${ELASTICSEARCH_VERSION:-6.8}
+    image: docker.io/wardenenv/elasticsearch:${ELASTICSEARCH_VERSION:-6.8}
     labels:
       - traefik.enable=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-elasticsearch.tls=true
diff --git a/environments/includes/mailhog.base.yml b/environments/includes/mailhog.base.yml
index 576c2ee9..3fd54faf 100644
--- a/environments/includes/mailhog.base.yml
+++ b/environments/includes/mailhog.base.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   mailhog:
     hostname: "${WARDEN_ENV_NAME}-mailhog"
-    image: quay.io/warden/mailhog:${MAILHOG_VERSION:-1.0}
+    image: docker.io/wardenenv/mailhog:${MAILHOG_VERSION:-1.0}
     labels:
       - traefik.enable=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.tls=true
diff --git a/environments/includes/nginx.base.yml b/environments/includes/nginx.base.yml
index 7ddde3a3..c0a58186 100644
--- a/environments/includes/nginx.base.yml
+++ b/environments/includes/nginx.base.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   nginx:
     hostname: "${WARDEN_ENV_NAME}-nginx"
-    image: quay.io/warden/nginx:${NGINX_VERSION:-1.16}
+    image: docker.io/wardenenv/nginx:${NGINX_VERSION:-1.16}
     depends_on:
       - php-fpm
     labels:
diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml
index 65410937..53b40441 100644
--- a/environments/includes/php-fpm.base.yml
+++ b/environments/includes/php-fpm.base.yml
@@ -11,7 +11,7 @@ x-extra_hosts: &extra_hosts
 services:
   php-fpm:
     hostname: "${WARDEN_ENV_NAME}-php-fpm"
-    image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}
+    image: docker.io/wardenenv/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}
     environment:
       - TRAEFIK_DOMAIN
       - TRAEFIK_SUBDOMAIN
@@ -23,7 +23,7 @@ services:
 
   php-debug:
     hostname: "${WARDEN_ENV_NAME}-php-debug"
-    image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}-debug
+    image: docker.io/wardenenv/php-fpm:${PHP_VERSION:-7.3}${WARDEN_SVC_PHP_VARIANT:-}-debug
     environment:
       - TRAEFIK_DOMAIN
       - TRAEFIK_SUBDOMAIN
diff --git a/environments/includes/rabbitmq.base.yml b/environments/includes/rabbitmq.base.yml
index ce95af3f..a41beb78 100644
--- a/environments/includes/rabbitmq.base.yml
+++ b/environments/includes/rabbitmq.base.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   rabbitmq:
     hostname: "${WARDEN_ENV_NAME}-rabbitmq"
-    image: quay.io/warden/rabbitmq:${RABBITMQ_VERSION:-3.7}
+    image: docker.io/wardenenv/rabbitmq:${RABBITMQ_VERSION:-3.7}
     labels:
       - traefik.enable=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-rabbitmq.tls=true
diff --git a/environments/includes/redis.base.yml b/environments/includes/redis.base.yml
index e6f4b934..7d4850d4 100644
--- a/environments/includes/redis.base.yml
+++ b/environments/includes/redis.base.yml
@@ -2,4 +2,4 @@ version: "3.5"
 services:
   redis:
     hostname: "${WARDEN_ENV_NAME}-redis"
-    image: quay.io/warden/redis:${REDIS_VERSION:-5.0}
+    image: docker.io/wardenenv/redis:${REDIS_VERSION:-5.0}
diff --git a/environments/includes/varnish.base.yml b/environments/includes/varnish.base.yml
index c4ae0e75..a8802b32 100644
--- a/environments/includes/varnish.base.yml
+++ b/environments/includes/varnish.base.yml
@@ -9,7 +9,7 @@ services:
 
   varnish:
     hostname: "${WARDEN_ENV_NAME}-varnish"
-    image: quay.io/warden/varnish:${VARNISH_VERSION:-6.0}
+    image: docker.io/wardenenv/varnish:${VARNISH_VERSION:-6.0}
     depends_on:
       - nginx
     labels:
diff --git a/environments/laravel/laravel.db.base.yml b/environments/laravel/laravel.db.base.yml
index b549aed0..205e11b5 100644
--- a/environments/laravel/laravel.db.base.yml
+++ b/environments/laravel/laravel.db.base.yml
@@ -6,7 +6,7 @@ services:
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-laravel}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-laravel}
diff --git a/environments/magento1/magento1.db.base.yml b/environments/magento1/magento1.db.base.yml
index 5bcb65c2..59883b7d 100644
--- a/environments/magento1/magento1.db.base.yml
+++ b/environments/magento1/magento1.db.base.yml
@@ -6,7 +6,7 @@ services:
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}
diff --git a/environments/magento2/magento2.db.base.yml b/environments/magento2/magento2.db.base.yml
index 12d8fe2c..921bf07b 100644
--- a/environments/magento2/magento2.db.base.yml
+++ b/environments/magento2/magento2.db.base.yml
@@ -6,7 +6,7 @@ services:
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}
diff --git a/environments/magento2/magento2.splitdb.checkout.base.yml b/environments/magento2/magento2.splitdb.checkout.base.yml
index 49b19af7..dd4578db 100644
--- a/environments/magento2/magento2.splitdb.checkout.base.yml
+++ b/environments/magento2/magento2.splitdb.checkout.base.yml
@@ -10,7 +10,7 @@ services:
 
   checkoutdb:
     hostname: "${WARDEN_ENV_NAME}-checkoutdb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}
diff --git a/environments/magento2/magento2.splitdb.sales.base.yml b/environments/magento2/magento2.splitdb.sales.base.yml
index e4bfab0a..64da7827 100644
--- a/environments/magento2/magento2.splitdb.sales.base.yml
+++ b/environments/magento2/magento2.splitdb.sales.base.yml
@@ -10,7 +10,7 @@ services:
 
   salesdb:
     hostname: "${WARDEN_ENV_NAME}-salesdb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}
diff --git a/environments/magento2/magento2.tests.base.yml b/environments/magento2/magento2.tests.base.yml
index 6b7b4c6f..32c5125d 100644
--- a/environments/magento2/magento2.tests.base.yml
+++ b/environments/magento2/magento2.tests.base.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   tmp-mysql:
     hostname: "${WARDEN_ENV_NAME}-mysql"
-    image: quay.io/warden/mysql:5.7
+    image: docker.io/wardenenv/mysql:5.7
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=magento_integration_tests
diff --git a/environments/symfony/symfony.db.base.yml b/environments/symfony/symfony.db.base.yml
index d1b3a42d..1b0aba10 100644
--- a/environments/symfony/symfony.db.base.yml
+++ b/environments/symfony/symfony.db.base.yml
@@ -6,7 +6,7 @@ services:
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
-    image: quay.io/warden/mariadb:${MARIADB_VERSION:-10.3}
+    image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-symfony}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-symfony}
diff --git a/images/.trigger b/images/.trigger
new file mode 100644
index 00000000..36de45a0
--- /dev/null
+++ b/images/.trigger
@@ -0,0 +1 @@
+0b32907e-d50d-45d6-ad25-badeb69517f8
diff --git a/images/php-fpm/blackfire/Dockerfile b/images/php-fpm/blackfire/Dockerfile
index f652b6ed..d179378f 100644
--- a/images/php-fpm/blackfire/Dockerfile
+++ b/images/php-fpm/blackfire/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=
-FROM quay.io/warden/php-fpm:${PHP_VERSION}
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}
 USER root
 
 RUN yum install -y pygpgme \
diff --git a/images/php-fpm/debug/Dockerfile b/images/php-fpm/debug/Dockerfile
index 8f9aa459..c129814c 100644
--- a/images/php-fpm/debug/Dockerfile
+++ b/images/php-fpm/debug/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=
-FROM quay.io/warden/php-fpm:${PHP_VERSION}
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}
 USER root
 
 RUN set -eux \
diff --git a/images/php-fpm/magento1/Dockerfile b/images/php-fpm/magento1/Dockerfile
index e4eb4c18..518370fa 100644
--- a/images/php-fpm/magento1/Dockerfile
+++ b/images/php-fpm/magento1/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}
 USER root
 
 RUN npm install -g grunt-cli gulp yarn
diff --git a/images/php-fpm/magento1/blackfire/Dockerfile b/images/php-fpm/magento1/blackfire/Dockerfile
index d72075d5..028a4e58 100644
--- a/images/php-fpm/magento1/blackfire/Dockerfile
+++ b/images/php-fpm/magento1/blackfire/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}-magento1
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}-magento1
 USER root
 
 RUN yum install -y pygpgme \
diff --git a/images/php-fpm/magento1/debug/Dockerfile b/images/php-fpm/magento1/debug/Dockerfile
index fab89c0d..8c8ffc27 100644
--- a/images/php-fpm/magento1/debug/Dockerfile
+++ b/images/php-fpm/magento1/debug/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}-magento1
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}-magento1
 USER root
 
 RUN set -eux \
diff --git a/images/php-fpm/magento2/Dockerfile b/images/php-fpm/magento2/Dockerfile
index a84b5918..50d61334 100644
--- a/images/php-fpm/magento2/Dockerfile
+++ b/images/php-fpm/magento2/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}
 USER root
 
 # Resolve permission issues stemming from directories auto-created by docker due to mounts in sub-directories
diff --git a/images/php-fpm/magento2/blackfire/Dockerfile b/images/php-fpm/magento2/blackfire/Dockerfile
index c1d6db38..17ba27d6 100644
--- a/images/php-fpm/magento2/blackfire/Dockerfile
+++ b/images/php-fpm/magento2/blackfire/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}-magento2
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}-magento2
 USER root
 
 RUN yum install -y pygpgme \
diff --git a/images/php-fpm/magento2/debug/Dockerfile b/images/php-fpm/magento2/debug/Dockerfile
index 0989cd25..ee550c4a 100644
--- a/images/php-fpm/magento2/debug/Dockerfile
+++ b/images/php-fpm/magento2/debug/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM quay.io/warden/php-fpm:${PHP_VERSION}-magento2
+FROM docker.io/wardenenv/php-fpm:${PHP_VERSION}-magento2
 USER root
 
 RUN set -eux \
diff --git a/images/scripts/build.sh b/images/scripts/build.sh
index 9a93d53a..3eba7d97 100755
--- a/images/scripts/build.sh
+++ b/images/scripts/build.sh
@@ -33,17 +33,17 @@ fi
 if [[ ${PUSH_FLAG} ]]; then
   if [[ ${DOCKER_USERNAME:-} ]]; then
     echo "Attempting non-interactive docker login (via provided credentials)"
-    echo "${DOCKER_PASSWORD:-}" | docker login -u "${DOCKER_USERNAME:-}" --password-stdin ${DOCKER_REGISTRY:-quay.io}
+    echo "${DOCKER_PASSWORD:-}" | docker login -u "${DOCKER_USERNAME:-}" --password-stdin ${DOCKER_REGISTRY:-docker.io}
   elif [[ -t 1 ]]; then
     echo "Attempting interactive docker login (tty)"
-    docker login ${DOCKER_REGISTRY:-quay.io}
+    docker login ${DOCKER_REGISTRY:-docker.io}
   fi
 fi
 
 ## iterate over and build each Dockerfile
 for file in $(find ${SEARCH_PATH} -type f -name Dockerfile | sort -V); do
     BUILD_DIR="$(dirname "${file}")"
-    IMAGE_TAG="quay.io/warden/$(echo "${BUILD_DIR}" | cut -d/ -f1)"
+    IMAGE_TAG="docker.io/wardenenv/$(echo "${BUILD_DIR}" | cut -d/ -f1)"
     IMAGE_SUFFIX="$(echo "${BUILD_DIR}" | cut -d/ -f2- -s | tr / - | sed 's/^-//')"
 
     ## due to build matrix requirements, magento1 and magento2 specific varients are built in separate invocation
diff --git a/version b/version
index 8f0916f7..4b9fcbec 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.5.0
+0.5.1