diff --git a/v2/internal/app/app_dev.go b/v2/internal/app/app_dev.go
index 58cd94ef..b4a43ba5 100644
--- a/v2/internal/app/app_dev.go
+++ b/v2/internal/app/app_dev.go
@@ -1,4 +1,4 @@
-//go:build dev
+//go:build dev && desktop
 
 package app
 
diff --git a/v2/internal/app/app_production.go b/v2/internal/app/app_production.go
index 4c217b17..1fc5aaec 100644
--- a/v2/internal/app/app_production.go
+++ b/v2/internal/app/app_production.go
@@ -1,4 +1,4 @@
-//go:build production
+//go:build production && desktop
 
 package app
 
diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go
index 3d623ed6..6f61627c 100644
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -1,5 +1,5 @@
-//go:build dev
-// +build dev
+//go:build dev || server || hybrid
+// +build dev server hybrid
 
 // Package devserver provides a web-based frontend so that
 // it is possible to run a Wails app in a browsers.
diff --git a/v2/internal/frontend/runtime/ipc_websocket.go b/v2/internal/frontend/runtime/ipc_websocket.go
index f8722ed3..ad661b44 100644
--- a/v2/internal/frontend/runtime/ipc_websocket.go
+++ b/v2/internal/frontend/runtime/ipc_websocket.go
@@ -1,5 +1,5 @@
-//go:build dev
-// +build dev
+//go:build dev || server || hybrid
+// +build dev server hybrid
 
 package runtime
 
diff --git a/v2/pkg/assetserver/assethandler_external.go b/v2/pkg/assetserver/assethandler_external.go
index 743f051e..a7919173 100644
--- a/v2/pkg/assetserver/assethandler_external.go
+++ b/v2/pkg/assetserver/assethandler_external.go
@@ -1,5 +1,5 @@
-//go:build dev
-// +build dev
+//go:build dev || hybrid || server
+// +build dev hybrid server
 
 package assetserver
 
diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go
index 853943f8..17e6724e 100644
--- a/v2/pkg/commands/build/build.go
+++ b/v2/pkg/commands/build/build.go
@@ -97,7 +97,7 @@ func Build(options *Options) (string, error) {
 	switch options.OutputType {
 	case "desktop":
 		builder = newDesktopBuilder(options)
-	case "dev":
+	case "dev", "hybrid", "server":
 		builder = newDesktopBuilder(options)
 	default:
 		return "", fmt.Errorf("cannot build assets for output type %s", options.ProjectData.OutputType)