diff --git a/Dockerfile b/Dockerfile
index 2092c21..7c45b03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,13 @@ RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev
 COPY . /build
 WORKDIR /build
 ARG DBG=0
-RUN /bin/bash -c 'if [[ $DBG -eq 1 ]]; then go install github.com/go-delve/delve/cmd/dlv@latest; else touch /go/bin/dlv; fi'
+RUN <<EOF
+if [[ $DBG -eq 1 ]]; then
+    go install github.com/go-delve/delve/cmd/dlv@latest
+else
+    touch /go/bin/dlv
+fi
+EOF
 RUN ./build.sh -o /usr/bin/mautrix-whatsapp
 
 FROM alpine:3.19
diff --git a/Dockerfile.dev b/Dockerfile.dev
index fa27bc1..9058310 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -5,7 +5,11 @@ RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev bash jq yq
 COPY . /build
 WORKDIR /build
 ARG DBG=0
-RUN /bin/bash -c 'if [[ $DBG -eq 1 ]]; then go install github.com/go-delve/delve/cmd/dlv@latest; else touch /go/bin/dlv; fi'
+if [[ $DBG -eq 1 ]]; then
+    go install github.com/go-delve/delve/cmd/dlv@latest
+else
+    touch /go/bin/dlv
+fi
 RUN ./build.sh -o /mautrix-whatsapp
 
 # Setup development stack using gow