diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 16491ab6e..0b7b83fae 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -115,6 +115,7 @@ nfpms:
       - libayatana-appindicator3-1
       - libgtk-3-dev
       - libappindicator3-dev
+      - netbird
 
   - maintainer: Netbird <dev@netbird.io>
     description: Netbird client UI.
@@ -134,6 +135,7 @@ nfpms:
       - libayatana-appindicator3-1
       - libgtk-3-dev
       - libappindicator3-dev
+      - netbird
 
   - maintainer: Netbird <dev@netbird.io>
     description: Netbird client.
diff --git a/client/cmd/service.go b/client/cmd/service.go
index 8745889db..7a6729850 100644
--- a/client/cmd/service.go
+++ b/client/cmd/service.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"runtime"
 
 	"github.com/kardianos/service"
 	log "github.com/sirupsen/logrus"
@@ -23,8 +24,12 @@ func newProgram(ctx context.Context, cancel context.CancelFunc) *program {
 }
 
 func newSVCConfig() *service.Config {
+	name := "netbird"
+	if runtime.GOOS == "windows" {
+		name = "Netbird"
+	}
 	return &service.Config{
-		Name:        "netbird",
+		Name:        name,
 		DisplayName: "Netbird",
 		Description: "A WireGuard-based mesh network that connects your devices into a single private network.",
 	}
diff --git a/client/ui/netbird.desktop b/client/ui/netbird.desktop
index a783056be..b3a1b92dc 100644
--- a/client/ui/netbird.desktop
+++ b/client/ui/netbird.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Netbird Agent
+Name=Netbird
 Exec=/usr/bin/netbird-ui
 Icon=netbird
 Type=Application