diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile
index 9770149e..476a1184 100644
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -3,8 +3,8 @@ FROM docker.io/library/golang:alpine AS aio-container-tools-builder
 
 # hadolint ignore=DL3022
 COPY --from=aio-container-tools . /tmp/aio-container-tools/
-RUN cd /tmp/aio-container-tools \
- && go build -o /usr/local/bin/aio-pg-healthcheck ./cmd/aio-pg-healthcheck
+WORKDIR /tmp/aio-container-tools
+RUN go build -o /usr/local/bin/aio-pg-healthcheck ./cmd/aio-pg-healthcheck
 
 FROM php:8.3.30-fpm-alpine3.23
 
diff --git a/Containers/postgresql/Dockerfile b/Containers/postgresql/Dockerfile
index 34236331..786f87c7 100644
--- a/Containers/postgresql/Dockerfile
+++ b/Containers/postgresql/Dockerfile
@@ -3,8 +3,8 @@ FROM docker.io/library/golang:alpine AS aio-container-tools-builder
 
 # hadolint ignore=DL3022
 COPY --from=aio-container-tools . /tmp/aio-container-tools/
-RUN cd /tmp/aio-container-tools \
- && go build -o /usr/local/bin/aio-pg-init ./cmd/aio-pg-init \
+WORKDIR /tmp/aio-container-tools
+RUN go build -o /usr/local/bin/aio-pg-init ./cmd/aio-pg-init \
  && go build -o /usr/local/bin/aio-pg-healthcheck ./cmd/aio-pg-healthcheck
 
 # From https://github.com/docker-library/postgres/blob/master/17/alpine3.23/Dockerfile