diff --git a/.devcontainer/security/Dockerfile b/.devcontainer/security/Dockerfile
index 0e50678ce0..dd866a4831 100644
--- a/.devcontainer/security/Dockerfile
+++ b/.devcontainer/security/Dockerfile
@@ -24,7 +24,7 @@ RUN git clone --depth 1 https://gitlab.com/federicomenaquintero/bzip2.git
 RUN git clone --depth 1 --recursive https://github.com/libjxl/libjxl
 RUN git -c http.sslVerify=false clone https://www.cl.cam.ac.uk/~mgk25/git/jbigkit
 
-ADD Magick++/fuzz/build_dependencies.sh build_dependencies.sh
+ADD oss-fuzz/build_dependencies.sh build_dependencies.sh
 
 ENV SRC=/ImageMagick/dependencies
 ENV WORK=/ImageMagick
diff --git a/.devcontainer/security/build_imagemagick.sh b/.devcontainer/security/build_imagemagick.sh
index 7da14c34e5..a0c4bca22c 100644
--- a/.devcontainer/security/build_imagemagick.sh
+++ b/.devcontainer/security/build_imagemagick.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-./Magick++/fuzz/build_imagemagick.sh
+./oss-fuzz/build_imagemagick.sh
 
 cat <<EOT >> /ImageMagick/etc/ImageMagick-7/policy.xml
 <policymap>
diff --git a/oss-fuzz/build.sh b/oss-fuzz/build.sh
index e407acc0ac..fb22e18027 100644
--- a/oss-fuzz/build.sh
+++ b/oss-fuzz/build.sh
@@ -3,7 +3,7 @@
 MAGICK_COMPILER=$CXX
 MAGICK_COMPILER_FLAGS=$CXXFLAGS
 MAGICK_INCLUDE="$WORK/include/ImageMagick-7"
-MAGICK_SRC="$SRC/imagemagick/Magick++/fuzz"
+MAGICK_SRC="$SRC/imagemagick/oss-fuzz"
 MAGICK_LIBS_NO_FUZZ="$WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/libheif.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libwebpmux.a $WORK/lib/libwebpdemux.a $WORK/lib/libsharpyuv.a $WORK/lib/libhwy.a $WORK/lib/libbrotlicommon.a $WORK/lib/libbrotlidec.a $WORK/lib/libbrotlienc.a $WORK/lib/libjxl_threads.a $WORK/lib/libjxl_cms.a $WORK/lib/libjxl.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a $WORK/lib/liblzma.a $WORK/lib/liblcms2.a $WORK/lib/libdeflate.a $WORK/lib/libz.a"
 MAGICK_LIBS="$LIB_FUZZING_ENGINE $MAGICK_LIBS_NO_FUZZ"
 MAGICK_OUTPUT=$OUT