diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 456a604..8d8ea06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ linux/arm64:
   <<: *build-linux
   image: dock.mau.dev/tulir/gomuks-build-docker:linux-arm64-native
   tags:
+  - linux
   - arm64
 
 windows/amd64:
diff --git a/debug/debug.go b/debug/debug.go
index cb4587d..315d56e 100644
--- a/debug/debug.go
+++ b/debug/debug.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
 	"runtime/debug"
 	"time"
@@ -34,7 +35,17 @@ var RecoverPrettyPanic bool
 var DeadlockDetection bool
 var WriteLogs bool
 var OnRecover func()
-var LogDirectory = filepath.Join(os.TempDir(), "gomuks")
+var LogDirectory = filepath.Join(os.TempDir(), "gomuks-"+getUname())
+
+func getUname() string {
+	currUser, err := user.Current()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	return currUser.Username
+}
 
 func Initialize() {
 	err := os.MkdirAll(LogDirectory, 0750)