diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index 944b40e..7c5effe 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -11,8 +11,6 @@ jobs:
         run: |
             git submodule init
             git submodule update
-      - name: Docker Build
-        run: scripts/switch/build-docker-image.sh
       - name: Build Chiaki
         run: scripts/switch/run-docker-build-chiaki.sh
 
diff --git a/scripts/switch/Dockerfile b/scripts/switch/Dockerfile
deleted file mode 100644
index 494013d..0000000
--- a/scripts/switch/Dockerfile
+++ /dev/null
@@ -1,80 +0,0 @@
-FROM archlinux:latest
-
-ENV DEVKITPRO=/opt/devkitpro
-ENV DEVKITARM=/opt/devkitpro/devkitARM
-ENV DEVKITPPC=/opt/devkitpro/devkitPPC
-ENV PATH="${PATH}:${DEVKITARM}/bin/:${DEVKITPPC}/bin/"
-
-ENV WORKDIR="/build"
-WORKDIR "${WORKDIR}"
-
-# Upgrade image
-RUN pacman --noconfirm -Syu
-
-# Install requirements for libtransistor 
-RUN pacman --noconfirm -S \
-    llvm \
-    clang \
-    lld \
-    python \
-    python-pip \
-    python-virtualenv \
-    squashfs-tools \
-    base-devel \
-    git \
-    cmake \
-    libx11 \
-    vim
-
-RUN pacman-key --init
-# Install devkitpro 
-# doc source :
-# https://devkitpro.org/wiki/devkitPro_pacman
-
-# First import the key which is used to validate the packages 
-RUN pacman-key --recv-keys F7FD5492264BB9D0
-RUN pacman-key --lsign F7FD5492264BB9D0
-
-# Add the devkitPro repositories
-ADD devkit_repo ./devkit_repo
-RUN cat ./devkit_repo >> /etc/pacman.conf
-# Install the keyring which adds more keys which may be used to verify the packages. 
-RUN pacman --noconfirm -U https://downloads.devkitpro.org/devkitpro-keyring-r1.787e015-2-any.pkg.tar.xz
-# Now resync the database and update installed packages.
-RUN pacman -Sy
-
-RUN pacman --noconfirm -Syu
-
-#RUN pacman --noconfirm -S $(pacman -Slq dkp-libs)
-
-RUN pacman --noconfirm -S \
-    protobuf \
-    python-protobuf \
-    sfml \
-    devkitARM \
-    switch-pkg-config \
-    devkitpro-pkgbuild-helpers \
-    switch-dev \
-    switch-zlib \
-    switch-sdl2 \
-    switch-freetype \
-    switch-curl \
-    switch-mesa \
-    switch-glad \
-    switch-glm \
-    switch-libconfig \
-    switch-sdl2_gfx \
-    switch-sdl2_ttf \
-    switch-sdl2_image \
-    switch-libexpat \
-    switch-bzip2 \
-    switch-libopus \
-    switch-ffmpeg \
-	switch-mbedtls
-
-# RUN pip3 install -U pip
-
-VOLUME ${WORKDIR}
-# nxlink server port
-EXPOSE 28771
-ENTRYPOINT ["/bin/bash"]
diff --git a/scripts/switch/build-docker-image.sh b/scripts/switch/build-docker-image.sh
deleted file mode 100755
index f8c7ea2..0000000
--- a/scripts/switch/build-docker-image.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd "`dirname $(readlink -f ${0})`"
-
-docker build "$@" -t chiaki-switch .
diff --git a/scripts/switch/devkit_repo b/scripts/switch/devkit_repo
deleted file mode 100644
index 2646e2d..0000000
--- a/scripts/switch/devkit_repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[dkp-libs]
-Server = http://downloads.devkitpro.org/packages
-
-[dkp-linux]
-Server = http://downloads.devkitpro.org/packages/linux
-
diff --git a/scripts/switch/run-docker-build-chiaki.sh b/scripts/switch/run-docker-build-chiaki.sh
index 660ab42..0fe7ad6 100755
--- a/scripts/switch/run-docker-build-chiaki.sh
+++ b/scripts/switch/run-docker-build-chiaki.sh
@@ -5,6 +5,6 @@ cd "`dirname $(readlink -f ${0})`/../.."
 docker run \
 	-v "`pwd`:/build/chiaki" \
 	-t \
-	chiaki-switch \
+	thestr4ng3r/chiaki-build-switch \
 	-c "cd /build/chiaki && scripts/switch/build.sh"