diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml
index 934f4a6344a..956602c77c1 100644
--- a/docker/DockerSettings.yaml
+++ b/docker/DockerSettings.yaml
@@ -18,10 +18,10 @@ build_stage_image:
     image: "build_${TARGETARCH}${TARGETVARIANT}"
     platform: "linux/amd64" # The Alpine build images only have linux/amd64 images
     arch_image:
-      amd64: "ghcr.io/blackdex/rust-musl:x86_64-musl-stable-{{rust_version}}"
-      arm64: "ghcr.io/blackdex/rust-musl:aarch64-musl-stable-{{rust_version}}"
-      armv7: "ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-{{rust_version}}"
-      armv6: "ghcr.io/blackdex/rust-musl:arm-musleabi-stable-{{rust_version}}"
+      amd64: "ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-{{rust_version}}"
+      arm64: "ghcr.io/dfunkt/rust-musl:aarch64-musl-stable-{{rust_version}}"
+      armv7: "ghcr.io/dfunkt/rust-musl:armv7-musleabihf-stable-{{rust_version}}"
+      armv6: "ghcr.io/dfunkt/rust-musl:arm-musleabi-stable-{{rust_version}}"
 # The final image which will be used to distribute the container images
 runtime_stage_image:
   debian: "docker.io/library/debian:{{debian_version}}-slim"
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
index 88b73fd2349..1f4ef95973c 100644
--- a/docker/Dockerfile.alpine
+++ b/docker/Dockerfile.alpine
@@ -31,10 +31,10 @@ FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:689b1e706f29e
 ########################## ALPINE BUILD IMAGES ##########################
 ## NOTE: The Alpine Base Images do not support other platforms then linux/amd64
 ## And for Alpine we define all build images here, they will only be loaded when actually used
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.78.0 as build_amd64
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.78.0 as build_arm64
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.78.0 as build_armv7
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.78.0 as build_armv6
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-1.78.0 as build_amd64
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:aarch64-musl-stable-1.78.0 as build_arm64
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:armv7-musleabihf-stable-1.78.0 as build_armv7
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:arm-musleabi-stable-1.78.0 as build_armv6
 
 ########################## BUILD IMAGE ##########################
 # hadolint ignore=DL3006
@@ -62,8 +62,8 @@ RUN mkdir -pv "${CARGO_HOME}" && \
     rustup set profile minimal
 
 # Creates a dummy project used to grab dependencies
-RUN USER=root cargo new --bin /app
-WORKDIR /app
+RUN USER=root cargo new --bin /appp
+WORKDIR /appp
 
 # Environment variables for Cargo on Alpine based builds
 RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
index 27193fec107..d1c25e78a3e 100644
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@@ -84,8 +84,8 @@ RUN mkdir -pv "${CARGO_HOME}" && \
     rustup set profile minimal
 
 # Creates a dummy project used to grab dependencies
-RUN USER=root cargo new --bin /app
-WORKDIR /app
+RUN USER=root cargo new --bin /appp
+WORKDIR /appp
 
 # Environment variables for Cargo on Debian based builds
 ARG ARCH_OPENSSL_LIB_DIR \
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index 108128e47a3..5abc42d9b63 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -103,8 +103,8 @@ RUN mkdir -pv "${CARGO_HOME}" && \
     rustup set profile minimal
 
 # Creates a dummy project used to grab dependencies
-RUN USER=root cargo new --bin /app
-WORKDIR /app
+RUN USER=root cargo new --bin /appp
+WORKDIR /appp
 
 {% if base == "debian" %}
 # Environment variables for Cargo on Debian based builds