diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb2d..bde97673fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Fixed an issue with deploying multilevel grouped functions containing v2 functions. (#6419)
diff --git a/src/gcp/cloudfunctionsv2.ts b/src/gcp/cloudfunctionsv2.ts
index 520e8e7967f..8f935952ff3 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.replace("-", "."),
+    FUNCTION_TARGET: functionId.replaceAll("-", "."),
   };
 
   try {
@@ -439,7 +439,7 @@ export async function updateFunction(cloudFunction: InputCloudFunction): Promise
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: functionId.replace("-", "."),
+    FUNCTION_TARGET: functionId.replaceAll("-", "."),
   };
 
   try {