diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
index 5c782037d..890455219 100644
--- a/.github/workflows/upmerge.yaml
+++ b/.github/workflows/upmerge.yaml
@@ -39,12 +39,16 @@ jobs:
           ref: edge
           # https://github.com/actions/checkout/issues/125#issuecomment-570254411
           fetch-depth: 0
+          persist-credentials: false
       
       - name: Configure git
+        env:
+            GH_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }}
         run: |
           git config --global user.email "radiuscoreteam@service.microsoft.com"
           git config --global user.name "Radius CI Bot"
-      
+          git remote set-url origin https://$GH_TOKEN@github.com/${{ github.repository }}
+
       # Create a new branch from edge. This branch will be used to PR back into edge.
       - name: Create new branch
         run: |
@@ -78,5 +82,5 @@ jobs:
       - name: Create pull request
         if: env.NO_CHANGES != 'true'
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT}}
-        run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME --signoff
+          GH_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+        run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..b43b79f29
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# These owners are the maintainers and approvers of this repo
+*       @radius-project/maintainers-docs @radius-project/approvers-docs
\ No newline at end of file
diff --git a/docs/content/getting-started/index.md b/docs/content/getting-started/index.md
index 5caceeb49..3a57de544 100644
--- a/docs/content/getting-started/index.md
+++ b/docs/content/getting-started/index.md
@@ -26,7 +26,7 @@ The Radius getting-started guide can be [run **for free** in a GitHub Codespace]
 ## 1. Have your Kubernetes cluster handy
 
 Radius runs inside [Kubernetes]({{< ref "guides/operations/kubernetes" >}}). However you run Kubernetes, get a cluster ready.
-> *If you don't have a preferred way to create Kubernetes clusters, you could try using [k3d](https://k3d.io/), which runs a minimal Kubernetes distribution in Docker. Make sure to apply the [recommended configuration]({{< ref "guides/operations/kubernetes/overview##supported-kubernetes-clusters" >}}).*
+> *If you don't have a preferred way to create Kubernetes clusters, you could try using [k3d](https://k3d.io/), which runs a minimal Kubernetes distribution in Docker. Make sure to apply the [recommended configuration]({{< ref "guides/operations/kubernetes/overview#supported-kubernetes-clusters" >}}).*
 
 Ensure your cluster is set as your current context:
 
diff --git a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
index 36982f53d..3c7c7d4b0 100644
--- a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
+++ b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
@@ -20,7 +20,7 @@ The AWS provider allows you to deploy and connect to AWS resources from a Radius
 - [rad CLI]({{< ref "installation#step-1-install-the-rad-cli" >}})
 - [Setup a supported Kubernetes cluster]({{< ref "/guides/operations/kubernetes/overview#supported-clusters" >}})
   - You will need the cluster's OIDC Issuer URL. [EKS Example](https://docs.aws.amazon.com/eks/latest/userguide/enable-iam-roles-for-service-accounts.html)
-- [Create an IAM Policy] (https://docs.aws.amazon.com/eks/latest/userguide/associate-service-account-role.html)
+- [Create an IAM Policy](https://docs.aws.amazon.com/eks/latest/userguide/associate-service-account-role.html)
 
 
 ## Setup the AWS IAM Roles for Service Accounts(IRSA) for Radius
diff --git a/docs/content/guides/operations/providers/overview/index.md b/docs/content/guides/operations/providers/overview/index.md
index d2d2c4790..a0cdf0f9a 100644
--- a/docs/content/guides/operations/providers/overview/index.md
+++ b/docs/content/guides/operations/providers/overview/index.md
@@ -19,3 +19,4 @@ Radius cloud providers allow you to deploy and connect to cloud resources across
 | [Microsoft Azure]({{< ref azure-provider >}}) | [Service Principal](https://learn.microsoft.com/en-us/entra/identity-platform/app-objects-and-service-principals?tabs=browser) | Deploy and connect to Azure resources using Service Principal |
 | | [Workload Identity](https://learn.microsoft.com/en-us/entra/workload-id/workload-identities-overview) | Deploy and connect to Azure resources using Workload Identity |
 | [Amazon Web Services]({{< ref aws-provider >}}) | [IAM access Key](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html) | Deploy and connect to AWS resources using IAM Access Key |
+| | [IAM Roles for Service Accounts](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html) | Deploy and connect to AWS resources using AWS IRSA |