diff --git a/arduino/sketch/sketch.go b/arduino/sketch/sketch.go
index 28aed70d861..337aa904d57 100644
--- a/arduino/sketch/sketch.go
+++ b/arduino/sketch/sketch.go
@@ -302,5 +302,5 @@ func GenBuildPath(sketchPath *paths.Path) *paths.Path {
 	}
 	md5SumBytes := md5.Sum([]byte(path))
 	md5Sum := strings.ToUpper(hex.EncodeToString(md5SumBytes[:]))
-	return paths.TempDir().Join("arduino-sketch-" + md5Sum)
+	return paths.TempDir().Join("arduino", "sketch-"+md5Sum)
 }
diff --git a/arduino/sketch/sketch_test.go b/arduino/sketch/sketch_test.go
index 87bf6e63543..cb7b624ab12 100644
--- a/arduino/sketch/sketch_test.go
+++ b/arduino/sketch/sketch_test.go
@@ -286,10 +286,10 @@ func TestNewSketchFolderSymlink(t *testing.T) {
 }
 
 func TestGenBuildPath(t *testing.T) {
-	want := paths.TempDir().Join("arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
+	want := paths.TempDir().Join("arduino", "sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
 	assert.True(t, GenBuildPath(paths.New("foo")).EquivalentTo(want))
 
-	want = paths.TempDir().Join("arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")
+	want = paths.TempDir().Join("arduino", "sketch-D41D8CD98F00B204E9800998ECF8427E")
 	assert.True(t, GenBuildPath(nil).EquivalentTo(want))
 }
 
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
index be605746b93..c7207760fb0 100644
--- a/commands/compile/compile.go
+++ b/commands/compile/compile.go
@@ -143,7 +143,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	// Optimize for debug
 	builderCtx.OptimizeForDebug = req.GetOptimizeForDebug()
 
-	builderCtx.CoreBuildCachePath = paths.TempDir().Join("arduino-core-cache")
+	builderCtx.CoreBuildCachePath = paths.TempDir().Join("arduino", "core-cache")
 
 	builderCtx.Jobs = int(req.GetJobs())
 
diff --git a/internal/integrationtest/compile_1/compile_test.go b/internal/integrationtest/compile_1/compile_test.go
index 7702ba0e4df..aa8bad05d1f 100644
--- a/internal/integrationtest/compile_1/compile_test.go
+++ b/internal/integrationtest/compile_1/compile_test.go
@@ -140,7 +140,7 @@ func compileWithSimpleSketch(t *testing.T, env *integrationtest.Environment, cli
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -374,7 +374,7 @@ func compileWithOutputDirFlag(t *testing.T, env *integrationtest.Environment, cl
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.FileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -441,7 +441,7 @@ func compileWithCustomBuildPath(t *testing.T, env *integrationtest.Environment,
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.eep").String())
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.elf").String())
 	require.NoFileExists(t, buildDir.Join(sketchName+".ino.hex").String())
@@ -975,7 +975,7 @@ func compileWithInvalidBuildOptionJson(t *testing.T, env *integrationtest.Enviro
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 
 	_, _, err = cli.Run("compile", "-b", fqbn, sketchPath.String(), "--verbose")
 	require.NoError(t, err)
diff --git a/internal/integrationtest/compile_2/compile_test.go b/internal/integrationtest/compile_2/compile_test.go
index c59c18d839e..dc67aeaf2b0 100644
--- a/internal/integrationtest/compile_2/compile_test.go
+++ b/internal/integrationtest/compile_2/compile_test.go
@@ -145,7 +145,7 @@ func recompileWithDifferentLibrary(t *testing.T, env *integrationtest.Environmen
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 
 	// Compile sketch using library not managed by CLI
 	stdout, _, err := cli.Run("compile", "-b", fqbn, "--library", manuallyInstalledLibPath.String(), sketchPath.String(), "-v")
diff --git a/internal/integrationtest/core/core_test.go b/internal/integrationtest/core/core_test.go
index 16ac2e4fc3b..cea3c33195b 100644
--- a/internal/integrationtest/core/core_test.go
+++ b/internal/integrationtest/core/core_test.go
@@ -253,7 +253,7 @@ func TestCoreInstallEsp32(t *testing.T) {
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
 	require.NotEmpty(t, sketchPathMd5)
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 	require.FileExists(t, buildDir.Join(sketchName+".ino.partitions.bin").String())
 }
 
diff --git a/internal/integrationtest/upload_mock/upload_mock_test.go b/internal/integrationtest/upload_mock/upload_mock_test.go
index db304ad8aec..208e48fd772 100644
--- a/internal/integrationtest/upload_mock/upload_mock_test.go
+++ b/internal/integrationtest/upload_mock/upload_mock_test.go
@@ -697,7 +697,7 @@ func TestUploadSketch(t *testing.T) {
 func generateBuildDir(sketchPath *paths.Path, t *testing.T) *paths.Path {
 	md5 := md5.Sum(([]byte(sketchPath.String())))
 	sketchPathMd5 := strings.ToUpper(hex.EncodeToString(md5[:]))
-	buildDir := paths.TempDir().Join("arduino-sketch-" + sketchPathMd5)
+	buildDir := paths.TempDir().Join("arduino", "sketch-"+sketchPathMd5)
 	require.NoError(t, buildDir.MkdirAll())
 	require.NoError(t, buildDir.ToAbs())
 	return buildDir