diff --git a/cli/jobs/spark/setup-attached-resources.sh b/cli/jobs/spark/setup-attached-resources.sh
index 0165830771..b383d02652 100644
--- a/cli/jobs/spark/setup-attached-resources.sh
+++ b/cli/jobs/spark/setup-attached-resources.sh
@@ -7,9 +7,9 @@ API_VERSION="2022-05-01"
 TOKEN=$(az account get-access-token --query accessToken -o tsv)
 AML_USER_MANAGED_ID=${RESOURCE_GROUP}-uai
 AML_USER_MANAGED_ID_OID=$(az identity show --resource-group $RESOURCE_GROUP -n $AML_USER_MANAGED_ID --query principalId -o tsv)
-GEN2_STORAGE_NAME="gen2automationspark"
-GEN2_FILE_SYSTEM="gen2filesystem"
-SYNAPSE_WORKSPACE_NAME="automation-syws"
+GEN2_STORAGE_NAME=${RESOURCE_GROUP}gen2
+GEN2_FILE_SYSTEM=${RESOURCE_GROUP}file
+SYNAPSE_WORKSPACE_NAME=${AML_WORKSPACE_NAME}-syws
 SQL_ADMIN_LOGIN_USER="automation"
 SQL_ADMIN_LOGIN_PASSWORD="auto123!"
 SPARK_POOL_NAME="automationpool"