diff --git a/content/en/docs/guides/install-guides/_index.md b/content/en/docs/guides/install-guides/_index.md
index 1c8d4ea1..f8d53d27 100644
--- a/content/en/docs/guides/install-guides/_index.md
+++ b/content/en/docs/guides/install-guides/_index.md
@@ -197,8 +197,8 @@ ssh <user>@<vm-address>
 ## Next steps
 
 * Go through the following exercises:
-  * [Free5GC Testbed Deployment and E2E testing with UERANSIM](/content/en/docs/guides/user-guides/exercise-1-free5gc.md)
-  * [OAI Core and RAN Testbed Deployment and E2E testing](/content/en/docs/guides/user-guides/exercise-2-oai.md)
+  * [Free5GC Testbed Deployment and E2E testing with UERANSIM](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-1-free5gc.md)
+  * [OAI Core and RAN Testbed Deployment and E2E testing](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-2-oai.md)
 * Dig in to the [user guide](/content/en/docs/guides/user-guides/_index.md).
 * Nephio sandbox environment:
   * Install on preprovisioned single VM.
diff --git a/content/en/docs/guides/install-guides/install-on-gce.md b/content/en/docs/guides/install-guides/install-on-gce.md
index e3ed8a85..47224092 100644
--- a/content/en/docs/guides/install-guides/install-on-gce.md
+++ b/content/en/docs/guides/install-guides/install-on-gce.md
@@ -75,7 +75,7 @@ gcloud compute ssh ubuntu@nephio-r3-e2e
 ## Next Steps
 
 * Step through the exercises
-  * [Free5GC Testbed Deployment and E2E testing with UERANSIM](/content/en/docs/guides/user-guides/exercise-1-free5gc.md)
+  * [Free5GC Testbed Deployment and E2E testing with UERANSIM](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-1-free5gc.md)
   * [OAI Core and RAN Testbed Deployment and E2E testing](/content/en/docs/guides/user-guides/exercise-2-oai.md)
 * Dig into the [user guide](/content/en/docs/guides/user-guides/_index.md)
 * In case you want to install Nephio on pre-provisioned VMs:
diff --git a/content/en/docs/guides/install-guides/install-on-gcp.md b/content/en/docs/guides/install-guides/install-on-gcp.md
index 08c2e329..608e0333 100644
--- a/content/en/docs/guides/install-guides/install-on-gcp.md
+++ b/content/en/docs/guides/install-guides/install-on-gcp.md
@@ -1389,6 +1389,6 @@ use workloads that do not rely on that functionality in order to experiment with
 
 {{% /alert %}}
 
-* Step through the [Free5GC](/content/en/docs/guides/user-guides/exercise-1-free5gc.md) and
-[OAI](/content/en/docs/guides/user-guides/exercise-2-oai.md) exercises
+* Step through the [Free5GC](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-1-free5gc.md) and
+[OAI](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-2-oai.md) exercises
 * Dig into the [user guide](/content/en/docs/guides/user-guides/_index.md)
diff --git a/content/en/docs/guides/user-guides/helm/flux-helm.md b/content/en/docs/guides/user-guides/helm/flux-helm.md
index b09a9563..04211b5b 100644
--- a/content/en/docs/guides/user-guides/helm/flux-helm.md
+++ b/content/en/docs/guides/user-guides/helm/flux-helm.md
@@ -18,9 +18,9 @@ Then, we can utilize the flux Custom Resources defined in another test kpt packa
 
 * [Nephio R1 sandbox]/content/en/docs/guides/install-guides/install-guides/_index.md): Set up the Nephio sandbox environment.
 * [Access to the Nephio Web UI](/content/en/docs/guides/install-guides/_index.md#access-to-the-user-interfaces)
-* [Nephio R1 sandbox workload clusters](/content/en/docs/guides/user-guides/exercise-1-free5gc.md):
+* [Nephio R1 sandbox workload clusters](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-1-free5gc.md):
   Create/Deploy the predefined set of workload clusters by completing the Free5GC Core quick start exercises up to and including
-  [Step 3](/content/en/docs/guides/user-guides/exercise-1-free5gc.md#step-3-deploy-two-edge-clusters).
+  [Step 3](/content/en/docs/guides/user-guides/usecase-user-guides/exercise-1-free5gc.md#step-3-deploy-two-edge-clusters).
 
 ### Deploying the flux-helm-controllers pkg
 
diff --git a/content/en/docs/porch/running-porch/running-on-GKE.md b/content/en/docs/porch/running-porch/running-on-GKE.md
index 4c896e2a..1380c145 100644
--- a/content/en/docs/porch/running-porch/running-on-GKE.md
+++ b/content/en/docs/porch/running-porch/running-on-GKE.md
@@ -24,7 +24,7 @@ need:
 * A [GCP Project](https://console.cloud.google.com/projectcreate)
 * [gcloud](https://cloud.google.com/sdk/docs/install)
 * [kubectl](https://kubernetes.io/docs/tasks/tools/); you can install it via `gcloud components install kubectl`
-* [porchctl](https://github.com/nephio-project/porch/releases/download/main/porchctl.tgz)
+* [porchctl](https://github.com/nephio-project/porch/releases/download/dev/porchctl.tgz)
 * Command line utilities such as *curl*, *tar*
 
 To build and run Porch on GKE, you will also need:
diff --git a/content/en/docs/porch/user-guides/porchctl-cli-guide.md b/content/en/docs/porch/user-guides/porchctl-cli-guide.md
index 8b620077..98b00b4f 100644
--- a/content/en/docs/porch/user-guides/porchctl-cli-guide.md
+++ b/content/en/docs/porch/user-guides/porchctl-cli-guide.md
@@ -9,7 +9,7 @@ description:
 
 When Porch was ported to Nephio, the `kpt alpha rpkg` commands in kpt were moved into a new command called `porchctl`. 
 
-To use it locally, [download](https://github.com/nephio-project/porch/releases/tag/main), unpack and add it to your PATH.
+To use it locally, [download](https://github.com/nephio-project/porch/releases/tag/dev), unpack and add it to your PATH.
 
 {{% alert title="Note" color="primary" %}}