diff --git a/.circleci/config.yml b/.circleci/config.yml
index c085358..0351f0e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,14 +2,14 @@ version: 2.1
 executors:
   docker-publisher:
     environment:
-      IMAGE_NAME: islamicnetwork/alquran.cloud
+      IMAGE_NAME: ghcr.io/islamic-network/alquran.cloud
       QUAYIO_IMAGE_NAME: quay.io/islamic-network/alquran.cloud
     docker:
       - image: circleci/buildpack-deps:stretch
   php74:
     docker:
-      - image: islamicnetwork/php:8.1-cli
-      - image: memcached:1.5
+      - image: ghcr.io/islamic-network/php:8.1-cli
+      - image: memcached:1.6
     working_directory: ~/repo
 jobs:
   build-app:
@@ -53,7 +53,7 @@ jobs:
       - run:
           name: Build Production Docker image
           command: |
-            echo "$DOCKERHUB_PASSWORD" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
+            echo "$GITHUB_TOKEN" | docker login ghcr.io --username "$DOCKERHUB_USERNAME" --password-stdin
             docker build -t $IMAGE_NAME:latest .
             echo "Pushing latest tag to Docker Hub..."
             docker push $IMAGE_NAME:latest
diff --git a/.k8s/manifest-dallas.yml b/.k8s/manifest-dallas.yml
index 3c347cd..fab32e6 100644
--- a/.k8s/manifest-dallas.yml
+++ b/.k8s/manifest-dallas.yml
@@ -36,7 +36,7 @@ spec:
           - containerPort: 9117
             protocol: TCP
       - name: alquran-cloud-app
-        image: islamicnetwork/alquran.cloud:$COMMIT_TAG
+        image: ghcr.io/islamic-network/alquran.cloud:$COMMIT_TAG
         env:
           - name:  API_BASE_URI
             value: http://alquran-cloud-api/v1/
diff --git a/.k8s/manifest-london.yml b/.k8s/manifest-london.yml
index 3c347cd..fab32e6 100644
--- a/.k8s/manifest-london.yml
+++ b/.k8s/manifest-london.yml
@@ -36,7 +36,7 @@ spec:
           - containerPort: 9117
             protocol: TCP
       - name: alquran-cloud-app
-        image: islamicnetwork/alquran.cloud:$COMMIT_TAG
+        image: ghcr.io/islamic-network/alquran.cloud:$COMMIT_TAG
         env:
           - name:  API_BASE_URI
             value: http://alquran-cloud-api/v1/
diff --git a/.k8s/manifest-singapore.yml b/.k8s/manifest-singapore.yml
index 3c347cd..fab32e6 100644
--- a/.k8s/manifest-singapore.yml
+++ b/.k8s/manifest-singapore.yml
@@ -36,7 +36,7 @@ spec:
           - containerPort: 9117
             protocol: TCP
       - name: alquran-cloud-app
-        image: islamicnetwork/alquran.cloud:$COMMIT_TAG
+        image: ghcr.io/islamic-network/alquran.cloud:$COMMIT_TAG
         env:
           - name:  API_BASE_URI
             value: http://alquran-cloud-api/v1/
diff --git a/Dockerfile b/Dockerfile
index 8d7bab2..851a29c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM islamicnetwork/php:8.1-apache
+FROM ghcr.io/islamic-network/php:8.1-apache
 
 # Copy files
 RUN cd ../ && rm -rf /var/www/html
diff --git a/README.md b/README.md
index a18053a..95d279e 100644
--- a/README.md
+++ b/README.md
@@ -28,12 +28,12 @@ The app is fully Dockerised. You **just need docker** to spin it up.
 
 A production ready Docker image of the app is published as:
 * quay.io/islamic-network/alquran.cloud on Quay
-* islamicnetwork/alquran.cloud on Docker Hub
+* ghcr.io/islamic-network/alquran.cloud on Docker Hub
 
 To get your own instance up, simply run:
 
 ```
-docker run -it -p 8081:8080  islamicnetwork/alquran.cloud:latest
+docker run -it -p 8081:8080  ghcr.io/islamic-network/alquran.cloud:latest
 ``` 
 
 You can now visit http://localhost:8081/ and start using it.
@@ -43,8 +43,8 @@ You can now visit http://localhost:8081/ and start using it.
 **Please note that the Dockerfile included builds a production ready container which has opcache switched on and xdebug turned off, so you will only see your changes every 5 minutes if you are developing. To actively develop, change the ```FROM vesica/php72:latest``` line to ```vesica/php72:dev```.**
 
 1. Clone this repository
-2. Run ```docker build . -t islamicnetwork/alquran.cloud```. This will build an image with production dependencies only.
-3. Run ```docker run -it -p 8081:8080  -v $(pwd)/.:/var/www islamicnetwork/alquran.cloud``` to spin up the built image.
+2. Run ```docker build . -t ghcr.io/islamic-network/alquran.cloud```. This will build an image with production dependencies only.
+3. Run ```docker run -it -p 8081:8080  -v $(pwd)/.:/var/www ghcr.io/islamic-network/alquran.cloud``` to spin up the built image.
 3. Run ```composer install``` to add development dependencies.
 6. Make sure you have internet connectivity so the app can connect to https://api.alquran.cloud.
 7. Open your browser and browse to http://localhost:8081/.