diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2
index ee260ba..dfe88b6 100644
--- a/templates/da_cache_to_shub.json.j2
+++ b/templates/da_cache_to_shub.json.j2
@@ -15,6 +15,7 @@
 		    "downloads" : "${workflow.input.descriptor.downloads.*}",
 		    "storagehub" : "{{ storagehub }}",
 		    "workspace" : "{{ workspace }}",
+		    "workspace_group" : "{{ workspace_group }}"
 		    "auth" : "Bearer ${workflow.input.token}",
 		    "parentfolder" : "Blue-Cloud Data Pool",
 		    "folder" : "${workflow.input.descriptor.userOrderName}-${workflow.input.descriptor.orderNumber}",
@@ -236,7 +237,7 @@
 						        "v2" : "${workflow.input.descriptor.userOrderName}",
 						        "v3" : "${workflow.input.descriptor.orderNumber}",
 						        "v4" : "${build_email_report.output.result.report}",
-						        "v5" : "${init.input.workspace}/group/next/workspace?itemid=${workflow.variables.target_folder_id}&operation=gotofolder",
+						        "v5" : "${init.input.workspace}/group/${init.input.workspace_group}/workspace?itemid=${workflow.variables.target_folder_id}&operation=gotofolder",
 						        "v6" : "${init.input.parentfolder}/${init.input.folder}"
 						    }
 						}