diff --git a/Dockerfile.source b/Dockerfile.source
index 63f135c..46011ba 100644
--- a/Dockerfile.source
+++ b/Dockerfile.source
@@ -1,4 +1,5 @@
-FROM golang:1.22.4-bullseye as build-base
+# syntax=docker.io/docker/dockerfile:1.7-labs
+FROM golang:1.22.4-bullseye AS build-base
 
 ENV PATH="${PATH}:/root/.cargo/bin/"
 
@@ -14,36 +15,55 @@ RUN /opt/rustup-init.sh -y --profile minimal
 # Install uniffi-bindgen-go
 RUN cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.2.1+v0.25.0
 
-FROM build-base as build
+FROM build-base AS build
 
 ENV GOEXPERIMENT=arenas
 ENV QUILIBRIUM_SIGNATURE_CHECK=false
+ENV GOCACHE=/tmp/.cache/go-build
+
+# Install grpcurl before building the node and client 
+# as to avoid needing to redo it on rebuilds
+RUN go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest
 
 WORKDIR /opt/ceremonyclient
 
-COPY . .
+# Copy everything except node and client so as to avoid 
+# invalidating the cache at this point on client or node rebuilds
+COPY --exclude=node --exclude=client . .
 
 ## Generate Rust bindings for VDF
 WORKDIR /opt/ceremonyclient/vdf
-RUN ./generate.sh
+RUN --mount=type=cache,target=/root/.cargo/registry \
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/opt/target/ \
+    ./generate.sh
 
 ## Generate Rust bindings for BLS48581
 WORKDIR /opt/ceremonyclient/bls48581
-RUN ./generate.sh
+RUN --mount=type=cache,target=/root/.cargo/registry \
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/opt/target/ \
+    ./generate.sh
 
-# Build and install the node
+COPY ./node /opt/ceremonyclient/node
 WORKDIR /opt/ceremonyclient/node
-
-RUN ./build.sh && cp node /go/bin
-RUN go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest
+RUN --mount=type=cache,target=/root/.cargo/registry \
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/opt/target/ \
+    --mount=type=cache,target=/tmp/.cache/go-build \
+    ./build.sh && cp node /go/bin
 
 # Build and install qclient
+COPY ./client /opt/ceremonyclient/client
 WORKDIR /opt/ceremonyclient/client
-
-RUN ./build.sh -o qclient && cp qclient /go/bin
+RUN --mount=type=cache,target=/root/.cargo/registry \
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/opt/target/ \
+    --mount=type=cache,target=/tmp/.cache/go-build \
+    ./build.sh -o qclient && cp qclient /go/bin
 
 # Allows exporting single binary
-FROM scratch as qclient
+FROM scratch AS qclient
 COPY --from=build /go/bin/qclient /qclient
 ENTRYPOINT [ "/qclient" ]
 
diff --git a/Dockerfile.source.dockerignore b/Dockerfile.source.dockerignore
new file mode 100644
index 0000000..5cff4b2
--- /dev/null
+++ b/Dockerfile.source.dockerignore
@@ -0,0 +1,12 @@
+# add any files that you don't want to have impact the COPY . . command
+# in the Dockerfile.source file (if listed here, they will not be copied.
+# if they need to be copied, use the --exclude flag in the Dockerfile.source file 
+# and copy them manually at the end to avoid rebuilding everything)
+# e.g. the Dockerfile.source.dockerignore file itself or the README.md file if not 
+# listed here would trigger a rebuild
+
+.gitignore
+Taskfile.yaml
+*.md
+*.env*
+Dockerfile*
\ No newline at end of file