diff --git a/.github/workflows/dockerhub-base.yml b/.github/workflows/dockerhub-base.yml
index 0b6dcd6f6e..bf6d7047dd 100644
--- a/.github/workflows/dockerhub-base.yml
+++ b/.github/workflows/dockerhub-base.yml
@@ -16,7 +16,7 @@ jobs:
     uses: nikhilbadyal/ghactions/.github/workflows/dockerhub-push.yml@main
     if: github.repository == 'nikhilbadyal/docker-py-revanced'
     with:
-      IMAGE_TAG: nikhilbadyaldevelops/docker-py-revanced-base:latest
+      IMAGE_TAG: ${{ github.repository }}-base:latest
       FILE: Dockerfile-base
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 97b4e59ff5..57457c4358 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -16,8 +16,6 @@ jobs:
   dockerhub-push:
     uses: nikhilbadyal/ghactions/.github/workflows/dockerhub-push.yml@main
     if: github.repository == 'nikhilbadyal/docker-py-revanced'
-    with:
-      IMAGE_TAG: nikhilbadyaldevelops/docker-py-revanced:latest
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index 06414f58c1..5e29f06835 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nikhilbadyaldevelops/docker-py-revanced-base
+FROM nikhilbadyal/docker-py-revanced-base
 
 # Copy and install Python dependencies
 COPY requirements.txt .
diff --git a/README.md b/README.md
index 60c9ac9439..3c3f13232f 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ You can use any of the following methods to build.
        ```
     2. Run script with
        ```shell
-       docker run -v "$(pwd)"/apks:/app/apks/  nikhilbadyaldevelops/docker-py-revanced
+       docker run -v "$(pwd)"/apks:/app/apks/  nikhilbadyal/docker-py-revanced
        ```
        You can pass the below environment variables (See notes) with the `-e` flag or use the `--env-file`
        [flag](https://docs.docker.com/engine/reference/commandline/run/#options).
diff --git a/docker-compose.yml b/docker-compose.yml
index cb19dd5dbd..edbef92a57 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   revanced:
-    image: nikhilbadyaldevelops/docker-py-revanced
+    image: nikhilbadyal/docker-py-revanced
     container_name: revanced-builder
     env_file:
       - .env