diff --git a/Dockerfile b/Dockerfile
index 09b73a4c..88fbae3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,10 +39,11 @@ CMD ["corrosion", "agent"]
 
 FROM alpine:${ALPINE_VERSION} AS corrosion-image-tarball
 ARG CORROSION_IMAGE="ghcr.io/psviderski/corrosion:latest"
+ARG TARGETOS
+ARG TARGETARCH
 
 RUN apk --no-cache add crane
-RUN crane pull "${CORROSION_IMAGE}" /corrosion.tar
-
+RUN crane pull --platform ${TARGETOS}/${TARGETARCH} "${CORROSION_IMAGE}" /corrosion.tar
 
 # Uncloud-in-Docker (ucind) image for running Uncloud test clusters using Docker.
 FROM docker:27.3.1-dind AS ucind
diff --git a/HACKING.md b/HACKING.md
index fdab9690..c0605dff 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -47,6 +47,16 @@ Windows:
 GOOS=linux GOARCH=amd64 go build -o uncloudd ./cmd/uncloudd
 ```
 
+## Docker in Docker (ucind)
+
+When running ucind and running in trouble, you must manually remove the cluster, by running:
+
+```shell
+docker stop CONTAINERID
+docker rm CONTAINERID
+docker network rm CLUSTERNAME
+```
+
 ## Testing
 
 Run all tests (unit and e2e):