diff --git a/.gitignore b/.gitignore
index 90027c4e12ac..99f4e1928907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,12 +10,12 @@
 /k0s.exe.code
 /pkg/assets/zz_generated_offsets*.go
 .*.stamp
-.tmp
+*.tmp
+*.tmp.*
 .terraform
 .idea
 *.tfstate*
 aws_private.pem
-out.json
 .vscode
 .k0sbuild.docker-image.*
 docs/cli
diff --git a/Makefile b/Makefile
index e00342a8972a..144695745380 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ controller_gen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/.con
 codegen_targets := $(controller_gen_targets)
 $(controller_gen_targets): $(K0S_BUILD_IMAGE_FILE) hack/tools/boilerplate.go.txt hack/tools/Makefile.variables
 	rm -rf 'static/_crds/$(dir $(@:pkg/apis/%/.controller-gen.stamp=%))'
-	gendir="$$(mktemp -d .controller-gen.XXXXXX.tmp)" \
+	gendir="$$(mktemp -d .controller-gen.tmp.XXXXXX)" \
 	  && trap "rm -rf -- $$gendir" INT EXIT \
 	  && CGO_ENABLED=0 $(GO) run sigs.k8s.io/controller-tools/cmd/controller-gen@v$(controller-gen_version) \
 	    paths="./$(dir $@)..." \
@@ -160,7 +160,7 @@ clientset_input_dirs := $(foreach gv,$(api_group_versions),pkg/apis/$(gv))
 codegen_targets += pkg/client/clientset/.client-gen.stamp
 pkg/client/clientset/.client-gen.stamp: $(shell find $(clientset_input_dirs) -type f -name '*.go' -not -name '*_test.go' -not -name 'zz_generated*')
 pkg/client/clientset/.client-gen.stamp: $(K0S_BUILD_IMAGE_FILE) hack/tools/boilerplate.go.txt embedded-bins/Makefile.variables
-	gendir="$$(mktemp -d .client-gen.XXXXXX.tmp)" \
+	gendir="$$(mktemp -d .client-gen.tmp.XXXXXX)" \
 	  && trap "rm -rf -- $$gendir" INT EXIT \
 	  && CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/client-gen@v$(kubernetes_version:1.%=0.%) \
 	    --go-header-file=hack/tools/boilerplate.go.txt \
diff --git a/embedded-bins/Makefile b/embedded-bins/Makefile
index 9ac6af7123b3..cac213d0be31 100644
--- a/embedded-bins/Makefile
+++ b/embedded-bins/Makefile
@@ -65,7 +65,7 @@ $(bindir)/kubelet.exe $(bindir)/kube-proxy.exe: .container.kubernetes.windows
 $(bindir)/containerd.exe $(bindir)/containerd-shim-runhcs-v1.exe: .container.containerd.windows
 
 $(addprefix $(bindir)/, $(bins)): | $(bindir)
-	tardir=$$(mktemp -d -- '.$(notdir $@).XXXXXX.tmp') \
+	tardir=$$(mktemp -d -- '.$(notdir $@).tmp.XXXXXX') \
 	  && trap "rm -rf -- $$tardir" INT EXIT \
 	  && docker export "$$(cat $<)" \
 	  | tar -C "$$tardir" -x bin/$(notdir $@) \