diff --git a/grpc-backend/database.go b/grpc-backend/database.go
index 9534c2b..f1c0412 100644
--- a/grpc-backend/database.go
+++ b/grpc-backend/database.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 
 	"github.com/juli0n21/go-osu-parser/parser"
@@ -60,7 +59,7 @@ func initDB(connectionString string, osuDb *parser.OsuDB, osuroot string) (*sql.
 		return nil, nil, err
 	}
 
-	collectionDB, err := parser.ParseCollectionsDB(path.Join(osuRoot, "collection.db"))
+	collectionDB, err := parser.ParseCollectionsDB(filepath.Join(osuRoot, "collection.db"))
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/grpc-backend/handlers.go b/grpc-backend/handlers.go
index e2872a5..72a2af7 100644
--- a/grpc-backend/handlers.go
+++ b/grpc-backend/handlers.go
@@ -9,6 +9,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 
 	v1 "backend/gen"
 	"backend/internal/db"
@@ -248,7 +249,7 @@ func (s *Server) songFile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	file, err := os.Open(s.OsuDir + "Songs/" + string(filename))
+	file, err := os.Open(filepath.Join(s.OsuDir, "Songs", string(filename)))
 	if err != nil {
 		fmt.Println(err)
 		http.Error(w, ErrFileNotFound.Error(), http.StatusNotFound)
@@ -280,7 +281,7 @@ func (s *Server) imageFile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	http.ServeFile(w, r, s.OsuDir+"Songs/"+string(filename))
+	http.ServeFile(w, r, filepath.Join(s.OsuDir, "Songs", string(filename)))
 }
 
 func (s *Server) callback(w http.ResponseWriter, r *http.Request) {