diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee0a9705125..aac70563f19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
+- Fixed an issue with deploying function groups containing v2 functions. (#6408)
 - Use GetDefaultBucket endpoint to fetch Storage Default Bucket.
diff --git a/src/gcp/cloudfunctionsv2.ts b/src/gcp/cloudfunctionsv2.ts
index 4f4912c0426..520e8e7967f 100644
--- a/src/gcp/cloudfunctionsv2.ts
+++ b/src/gcp/cloudfunctionsv2.ts
@@ -331,7 +331,7 @@ export async function createFunction(cloudFunction: InputCloudFunction): Promise
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: functionId,
+    FUNCTION_TARGET: functionId.replace("-", "."),
   };
 
   try {
@@ -439,7 +439,7 @@ export async function updateFunction(cloudFunction: InputCloudFunction): Promise
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: functionId,
+    FUNCTION_TARGET: functionId.replace("-", "."),
   };
 
   try {