diff --git a/debug.go b/debug.go
index 0961601..66e3612 100644
--- a/debug.go
+++ b/debug.go
@@ -7,7 +7,6 @@ package main
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -16,6 +15,7 @@ import (
 	"gopkg.in/logrusorgru/aurora.v2"
 
 	"code.dumpstack.io/tools/out-of-tree/config"
+	"code.dumpstack.io/tools/out-of-tree/fs"
 	"code.dumpstack.io/tools/out-of-tree/qemu"
 )
 
@@ -144,7 +144,7 @@ func (cmd *DebugCmd) Run(g *Globals) (err error) {
 	}
 	defer q.Stop()
 
-	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
+	tmp, err := fs.TempDir()
 	if err != nil {
 		return
 	}
diff --git a/main.go b/main.go
index b537788..08b0eb6 100644
--- a/main.go
+++ b/main.go
@@ -99,8 +99,6 @@ func (lw *LevelWriter) WriteLevel(l zerolog.Level, p []byte) (n int, err error)
 	return len(p), nil
 }
 
-var tempDirBase string
-
 var consoleWriter, fileWriter LevelWriter
 
 var loglevel zerolog.Level
@@ -139,9 +137,6 @@ func main() {
 		return
 	}
 
-	tempDirBase = usr.HomeDir + "/.out-of-tree/tmp/"
-	os.MkdirAll(tempDirBase, os.ModePerm)
-
 	consoleWriter = LevelWriter{Writer: zerolog.NewConsoleWriter(
 		func(w *zerolog.ConsoleWriter) {
 			w.Out = os.Stderr
diff --git a/pew.go b/pew.go
index f895dc6..a8bfa61 100644
--- a/pew.go
+++ b/pew.go
@@ -659,7 +659,7 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
 		}
 	}()
 
-	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
+	tmp, err := fs.TempDir()
 	if err != nil {
 		slog.Error().Err(err).Msg("making tmp directory")
 		return
diff --git a/preload.go b/preload.go
index acafadd..1edeac1 100644
--- a/preload.go
+++ b/preload.go
@@ -8,7 +8,6 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"errors"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -62,7 +61,7 @@ func preload(q *qemu.System, ki config.KernelInfo, pm config.PreloadModule,
 func buildAndInsmod(workPath string, q *qemu.System, ki config.KernelInfo,
 	dockerTimeout time.Duration, cache string) (err error) {
 
-	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
+	tmp, err := fs.TempDir()
 	if err != nil {
 		return
 	}