diff --git a/.devcontainer/scripts/post-create.sh b/.devcontainer/scripts/post-create.sh
index 31a97a72c3..3488e3de42 100755
--- a/.devcontainer/scripts/post-create.sh
+++ b/.devcontainer/scripts/post-create.sh
@@ -5,5 +5,5 @@ set -e
 sudo bash ./devops/scripts/set_docker_sock_permission.sh
 
 # install tre CLI
-(cd /workspaces/AzureTRE/cli/ && make install-cli)  && echo -e "\n# Set up tre completion\nsource <(_TRE_COMPLETE=bash_source tre)" >> ~/.bashrc
+(cd ./cli/ && make install-cli)  && echo -e "\n# Set up tre completion\nsource <(_TRE_COMPLETE=bash_source tre)" >> ~/.bashrc
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72da340088..620eb4dce0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,21 +3,9 @@
 
 ## 0.5.1 (Unreleased)
 
-**BREAKING CHANGES & MIGRATIONS**:
-
-*
-
-FEATURES:
-
-*
-
-ENHANCEMENTS:
-
-*
-
 BUG FIXES:
 
-*
+* Fix shared service 409 installation issue when in status other than deployed ([#2725](https://github.com/microsoft/AzureTRE/pull/2725))
 
 
 
diff --git a/devops/scripts/deploy_shared_service.sh b/devops/scripts/deploy_shared_service.sh
index 029717af81..e196aeada4 100755
--- a/devops/scripts/deploy_shared_service.sh
+++ b/devops/scripts/deploy_shared_service.sh
@@ -49,7 +49,7 @@ if [[ "$last_result" != 0 ]]; then
 fi
 
 deployed_shared_service=$(echo "${get_shared_services_result}" \
-  | jq -r ".sharedServices[] | select(.templateName == \"${template_name}\" and .deploymentStatus == \"deployed\")")
+  | jq -r ".sharedServices[] | select(.templateName == \"${template_name}\" and (.deploymentStatus != \"deleted\" or .deploymentStatus != \"deployment_failed\"))")
 
 if [[ -n "${deployed_shared_service}" ]]; then
   # Get template version of the service already deployed