diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 38fe07e..51a6ee9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -9,7 +9,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: clang-format
       run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source ./include
+        docker run --rm -v ${PWD}:/src  ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source ./include
   build-lib:
     runs-on: ubuntu-22.04
     needs: clang-format
diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml
index cd92f40..c0e5b8f 100644
--- a/.github/workflows/push_image.yml
+++ b/.github/workflows/push_image.yml
@@ -3,6 +3,11 @@ on:
   push:
     branches:
       - master
+
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   clang-format:
     runs-on: ubuntu-22.04
@@ -10,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: clang-format
       run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source ./include
+        docker run --rm -v ${PWD}:/src  ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source ./include
   build:
     runs-on: ubuntu-latest
     needs: clang-format
@@ -20,14 +25,13 @@ jobs:
       id: get_release_tag
       run: |
         echo RELEASE_VERSION=$(echo $(date '+%Y%m%d')) >> $GITHUB_ENV
-        echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//" | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
-        echo REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $1}' |  sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
     - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name: ${{ env.REPOSITORY_OWNER }}/${{ env.REPOSITORY_NAME }}
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        name: ${{ github.repository }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
         snapshot: true
         cache: true
         tags: "latest, ${{ env.RELEASE_VERSION }}"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7e6b293..b346f97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM wiiuenv/devkitppc:20220806
+FROM ghcr.io/wiiu-env/devkitppc:20220806
 
 WORKDIR tmp_build
 COPY . .
diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal
index 08fc052..90b5bdb 100644
--- a/Dockerfile.buildlocal
+++ b/Dockerfile.buildlocal
@@ -1,3 +1,3 @@
-FROM wiiuenv/devkitppc:20220806
+FROM ghcr.io/wiiu-env/devkitppc:20220806
 
 WORKDIR project
\ No newline at end of file