diff --git a/.github/workflows/Dockerfile-opendingux b/.github/workflows/Dockerfile-opendingux
index b88fade03..22d41724d 100644
--- a/.github/workflows/Dockerfile-opendingux
+++ b/.github/workflows/Dockerfile-opendingux
@@ -17,10 +17,10 @@ RUN	wget --no-check-certificate "https://github.com/Ninoh-FOX/toolchain/releases
 	tar xjCf /opt opendingux-gcw0-toolchain.2021-09-08.tar.bz2
 
 # toolchain definitions
-# NB on newer GKD firmware there's a problem with missing exception handlers
-# Undefining those functions and linking in libgcc_eh solves this.
+# NB on newer GKD firmware there's a problem with missing exception handlers in
+# libgcc_s.so. Undefining those functions and linking in libgcc_eh solves this.
 ENV PATH=/opt/gcw0-toolchain-od/usr/bin:$PATH
 ENV TS=/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot
 ENV CFLAGS="--sysroot $TS -I$TS/usr/include/SDL -mabicalls"
-ENV LDFLAGS="$CFLAGS -Wl,--dynamic-linker=/lib/ld-uClibc.so.0 -u__register_frame_info -u__deregister_frame_info -lgcc_eh"
+ENV LDFLAGS="$CFLAGS -Wl,--dynamic-linker=/lib/ld-uClibc.so.0 -u__register_frame_info -u__deregister_frame_info -L$TS/../lib -lgcc_eh"
 ENV CROSS_COMPILE=mipsel-linux-
diff --git a/.github/workflows/Dockerfile-psp b/.github/workflows/Dockerfile-psp
deleted file mode 100644
index 432fb0e23..000000000
--- a/.github/workflows/Dockerfile-psp
+++ /dev/null
@@ -1,22 +0,0 @@
-# build container for PSP
-
-FROM --platform=linux/amd64 ghcr.io/pspdev/pspsdk
-
-ENV UNPRIVILEGED_USER_GROUPS=sudo
-
-# minimal build environment
-RUN	apk add zip
-
-# toolchain definitions
-ENV CFLAGS="-U_FORTIFY_SOURCE -I/home/include"
-ENV LDFLAGS="-L/home/lib"
-
-# additional libraries
-RUN	cd /home && mkdir /home/lib /home/include && \
-	wget "http://www.zlib.net/zlib-1.3.tar.gz" && tar xzf zlib-1.3.tar.gz && cd zlib-1.3 && \
-	CC=psp-gcc CFLAGS="$CFLAGS -Os" ./configure --static --libdir=/home/lib --includedir=/home/include && \
-	make AR=psp-ar install
-RUN	cd /home && wget --no-check-certificate "https://downloads.sourceforge.net/project/libpng/libpng12/1.2.59/libpng-1.2.59.tar.gz" && \
-	tar xzf libpng-1.2.59.tar.gz && cd libpng-1.2.59 && \
-	CC=psp-gcc CFLAGS="$CFLAGS -Os" ./configure --host=mips-elf --libdir=/home/lib --includedir=/home/include && \
-	make install
diff --git a/.github/workflows/ci-psp.yml b/.github/workflows/ci-psp.yml
index 8856c00f5..77ca79c24 100644
--- a/.github/workflows/ci-psp.yml
+++ b/.github/workflows/ci-psp.yml
@@ -10,15 +10,16 @@ jobs:
     - name: build environment
       run: |
         whoami
-        docker build -f .github/workflows/Dockerfile-psp -t build-psp .
+        docker pull --platform=linux/amd64 ghcr.io/pspdev/pspdev
     - name: build
       run: |
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
-        dock="docker run -i -v $PWD:/home/picodrive -w /home/picodrive build-psp"
-        $dock sh -c "git config --global --add safe.directory /home/picodrive"
+        dock="docker run -i -v $PWD:/home/picodrive -w /home/picodrive ghcr.io/pspdev/pspdev"
+        #$dock sh -c "git config --global --add safe.directory /home/picodrive"
         $dock sh -c "CROSS_COMPILE=psp- ./configure --platform=psp"
         $dock sh -c "CROSS_COMPILE=psp- make"
-        $dock sh -c "make -C platform/psp rel VER=$ver"
+        #$dock sh -c "make -C platform/psp rel VER=$ver"
+        make -C platform/psp rel VER=$ver
     - name: artifacts
       uses: actions/upload-artifact@v3
       with: