diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index cd43a462..fe248053 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -27,7 +27,7 @@
 			"ms-python.python",
 			"dunn.redis",
 			"GitHub.copilot",
-			"/tmp/rad-vscode-bicep.vsix"
+			"ms-azuretools.rad-vscode-bicep"
 		]
 	  }
 	},
diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh
index 14a38636..ed604f31 100644
--- a/.devcontainer/on-create.sh
+++ b/.devcontainer/on-create.sh
@@ -16,10 +16,7 @@ else
 fi
 
 if [ "$RADIUS_VERSION" = "edge" ]; then
-    wget -q "https://get.radapp.dev/tools/rad/install.sh" -O - | /bin/bash -s edge
+    wget -q "https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh" -O - | /bin/bash -s edge
 else
-    wget -q "https://get.radapp.dev/tools/rad/install.sh" -O - | /bin/bash
+    wget -q "https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh" -O - | /bin/bash
 fi
-
-## Download Bicep extension
-curl https://get.radapp.dev/tools/vscode-extensibility/$RADIUS_VERSION/rad-vscode-bicep.vsix --output /tmp/rad-vscode-bicep.vsix
\ No newline at end of file
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ac84ef97..1905fde2 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -23,7 +23,7 @@ on:
   schedule: # 7:45 AM Pacific Time
     - cron: "45 15 * * *"
 env:
-  RAD_CLI_URL: https://get.radapp.dev/tools/rad/install.sh
+  RAD_CLI_URL: https://raw.githubusercontent.com/radius-project/radius/main/deploy/install.sh
   RUN_IDENTIFIER: samplestest-${{ github.run_id }}-${{ github.run_attempt }}
 jobs:
   test:
@@ -191,8 +191,8 @@ jobs:
               echo "Downloading rad CLI version ${{ inputs.version }}"
               wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s ${{ inputs.version }}
             else
-              echo "Downloading edge rad CLI"
-              wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash -s edge
+              echo "Downloading latest rad CLI"
+              wget -q "${{ env.RAD_CLI_URL }}" -O - | /bin/bash
             fi
 
             if [ $? -eq 0 ]; then
diff --git a/samples/eshop/README.md b/samples/eshop/README.md
index f858478c..a8869007 100644
--- a/samples/eshop/README.md
+++ b/samples/eshop/README.md
@@ -1,6 +1,6 @@
 # eShop on Radius reference application
 
-Visit the [Project Radius docs](https://radapp.dev/getting-started/reference-apps/eshop/) to learn more and try it out.
+Visit the [Project Radius docs](https://docs.radapp.io/tutorials/eshop/) to learn more and try it out.
 
 ## Source
 
@@ -8,10 +8,10 @@ This reference app is a "radified" version of the [eShop on containers](https://
 
 ## Deploy
 
-1. Have a kubernetes cluster handy from the [supported clusters](https://docs.radapp.dev/operations/platforms/kubernetes/supported-clusters/).
+1. Have a kubernetes cluster handy from the [supported clusters](https://docs.radapp.io/guides/operations/kubernetes/overview/#supported-kubernetes-clusters).
    - (AWS only) Make sure that each of the Subnets in your EKS cluster Subnet Group are within the list of [supported MemoryDB availability zones](https://docs.aws.amazon.com/memorydb/latest/devguide/subnetgroups.html) 
-1. [Install the rad CLI](https://radapp.dev/getting-started/)
-1. [Initialize a new Radius environment](https://radapp.dev/getting-started/)
+1. [Install the rad CLI](https://docs.radapp.io/getting-started/)
+1. [Initialize a new Radius environment](https://docs.radapp.io/getting-started/)
 1. Clone the repository and switch to the app directory:
    ```bash
    git clone https://github.com/radius-project/samples.git