diff --git a/makeimage.sh b/makeimage.sh
index 2e63a43..2b73e37 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -63,5 +63,7 @@ docker buildx --builder ffbuilder build \
     --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \
     --load --tag "$IMAGE" .
 
-docker container stop ffbuildreg
-docker buildx rm -f ffbuilder
+if [[ -z "$NOCLEAN" ]]; then
+    docker container stop ffbuildreg
+    docker buildx rm -f ffbuilder
+fi