diff --git a/code/tools/build/components.lua b/code/tools/build/components.lua
index 20b9e08489..6b0771b9b7 100644
--- a/code/tools/build/components.lua
+++ b/code/tools/build/components.lua
@@ -224,6 +224,12 @@ local do_component = function(name, comp)
 		groupName = groupName .. '/' .. val
 	end
 
+	-- replace '/common/citizen/server' prefix with '/server'
+	local serverMatch = '/common/citizen/server'
+	if groupName:sub(1, #serverMatch) == serverMatch then
+		groupName = '/server' .. groupName:sub(#serverMatch + 1)
+	end
+
 	-- hack: `net` breaks premake/.vs group generator
 	if comp.name == 'net' then
 		groupName = groupName .. '/net'