diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d3448e..520dcdd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,12 +2,12 @@ version: 2.1
 executors:
   docker-publisher:
     environment:
-      IMAGE_NAME: vesica/api.aladhan.com
+      IMAGE_NAME: quay.io/islamic-network/api.aladhan.com
     docker:
       - image: circleci/buildpack-deps:stretch
   php72:
     docker:
-      - image: vesica/php72
+      - image: quay.io/vesica/php72
       - image: memcached:1.5
     working_directory: ~/repo
 
@@ -73,7 +73,7 @@ jobs:
       - run:
           name: Publish Docker Image to Docker Hub
           command: |
-            echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            echo "$QUAYIO_PASSWORD" | docker login quay.io -u "$QUAYIO_USERNAME" --password-stdin
             IMAGE_TAG="${CIRCLE_BUILD_NUM}"
             docker push $IMAGE_NAME:latest
   publish-docker-tag:
@@ -88,7 +88,7 @@ jobs:
       - run:
           name: Publish Docker Image to Docker Hub
           command: |
-            echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            echo "$QUAYIO_PASSWORD" | docker login quay.io -u "$QUAYIO_USERNAME" --password-stdin
             IMAGE_TAG=${CIRCLE_TAG}
             docker tag $IMAGE_NAME:latest $IMAGE_NAME:$IMAGE_TAG
             docker push $IMAGE_NAME:$IMAGE_TAG
diff --git a/Dockerfile b/Dockerfile
index a6c885d..799cb10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vesica/php72:latest
+FROM quay.io/vesica/php72:latest
 
 # Copy files
 RUN cd ../ && rm -rf /var/www/html
diff --git a/README.md b/README.md
index 2ab38d8..ba847bb 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The api and all its dependencies are fully Dockerised. You **just need docker an
 
 You should enter your Google Maps API Key and Ask Geo Account ID and keys in the docker-compose file on lines 27, 28 and 29.
 
-A production ready Docker image of the app is published as vesica/api.aladhan.com on Docker Hub (https://hub.docker.com/r/vesica/api.aladhan.com/).
+A production ready Docker image of the app is published as quay.io/islamic-network/api.aladhan.com on Quay.io.
 
 To get your own instance up, simply run: