diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 63b0cdc93..fa3244e56 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM sidechains-substrate-node-builder:latest as builder
+FROM partner-chains-node-builder:latest AS builder
 
 FROM docker.io/library/ubuntu:20.04
 COPY --from=builder /partner-chains-node/docker-build/target/release/partner-chains-node /usr/local/bin
@@ -7,7 +7,7 @@ RUN useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate && \
 	mkdir -p /data /substrate/.local/share/partner-chains-node && \
 	chown -R substrate:substrate /data && \
 	ln -s /data /substrate/.local/share/partner-chains-node && \
-# Sanity checks
+	# Sanity checks
 	ldd /usr/local/bin/partner-chains-node && \
 	/usr/local/bin/partner-chains-node --version
 
diff --git a/dev/docker/build-images-local.sh b/dev/docker/build-images-local.sh
index 1a8ecfb36..4671a1fe8 100755
--- a/dev/docker/build-images-local.sh
+++ b/dev/docker/build-images-local.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env sh
-docker build --pull -f docker/builder.Dockerfile -t "partner-chains-node-builder:latest" --ssh default . && \
-docker build -f docker/Dockerfile -t partner-chains-node:latest docker
+# This script has to be executed from the root of the repository to enable proper context for the Docker build. `./dev/docker/build-images-local.sh`
+docker build --pull -f dev/docker/builder.Dockerfile -t "partner-chains-node-builder:latest" --ssh default . && \
+docker build -f dev/docker/Dockerfile -t partner-chains-node:latest dev/docker
diff --git a/dev/docker/builder.Dockerfile b/dev/docker/builder.Dockerfile
index fca95fa1e..a5cbba269 100644
--- a/dev/docker/builder.Dockerfile
+++ b/dev/docker/builder.Dockerfile
@@ -1,8 +1,8 @@
-FROM docker.io/paritytech/ci-unified:bullseye-1.81.0-2024-09-11-v202409111034 as builder
+FROM docker.io/paritytech/ci-unified:bullseye-1.81.0-2024-09-11-v202409111034 AS builder
 
 WORKDIR /partner-chains-node
 COPY . /partner-chains-node
 
 RUN mkdir -p docker-build/cargo-home || echo "cargo-home already exists" && \
-    export CARGO_HOME="$(pwd)/docker-build/cargo-home"
+	export CARGO_HOME="$(pwd)/docker-build/cargo-home"
 RUN --mount=type=ssh cargo build --release --target-dir=docker-build/target