diff --git a/docs/getting_started.md b/docs/getting_started.md
index 536749b9..a6620f5f 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -233,7 +233,6 @@ Specify task parameters as it is shown in the table below:
 Save the pipeline and create a release to trigger it manually. Once the pipeline execution is finished, check out deployments in the **mlops-AML-WS** workspace.
 
 
-
 Congratulations! You have three pipelines set up end to end:
    - Build pipeline: triggered on code change to master branch on GitHub, performs linting, unit testing and publishing a training pipeline
    - Release Trigger pipeline: runs a published training pipeline to train, evaluate and register a model
diff --git a/environment_setup/iac-remove-environment.yml b/environment_setup/iac-remove-environment.yml
index 4ca8b04e..67626223 100644
--- a/environment_setup/iac-remove-environment.yml
+++ b/environment_setup/iac-remove-environment.yml
@@ -18,7 +18,7 @@ steps:
   inputs:
     azureSubscription: 'AzureResourceConnection'
     action: 'DeleteRG'
-    resourceGroupName: '$(BASE_NAME)-AML-RG'
+    resourceGroupName: '$(RESOURCE_GROUP)'
     location: $(LOCATION)
   displayName: 'Delete resources in Azure'
 
diff --git a/ml_service/pipelines/build_train_pipeline.py b/ml_service/pipelines/build_train_pipeline.py
index df5dcdcc..c2b3627d 100644
--- a/ml_service/pipelines/build_train_pipeline.py
+++ b/ml_service/pipelines/build_train_pipeline.py
@@ -16,7 +16,7 @@
 def main():
     load_dotenv()
     workspace_name = os.environ.get("BASE_NAME")+"-AML-WS"
-    resource_group = os.environ.get("BASE_NAME")+"-AML-RG"
+    resource_group = os.environ.get("RESOURCE_GROUP")
     subscription_id = os.environ.get("SUBSCRIPTION_ID")
     tenant_id = os.environ.get("TENANT_ID")
     app_id = os.environ.get("SP_APP_ID")
diff --git a/tests/unit/code_test.py b/tests/unit/code_test.py
index b22b186c..0d0ccc31 100644
--- a/tests/unit/code_test.py
+++ b/tests/unit/code_test.py
@@ -8,7 +8,7 @@
 # a utility function common_scoring.next_saturday
 def test_get_workspace():
     workspace_name = os.environ.get("BASE_NAME")+"-AML-WS"
-    resource_group = os.environ.get("BASE_NAME")+"-AML-RG"
+    resource_group = os.environ.get("RESOURCE_GROUP")
     subscription_id = os.environ.get("SUBSCRIPTION_ID")
     tenant_id = os.environ.get("TENANT_ID")
     app_id = os.environ.get("SP_APP_ID")