diff --git a/azure_jumpstart_arcbox/ARM/azuredeploy.json b/azure_jumpstart_arcbox/ARM/azuredeploy.json
index 473ac4ba12..5693f17e51 100644
--- a/azure_jumpstart_arcbox/ARM/azuredeploy.json
+++ b/azure_jumpstart_arcbox/ARM/azuredeploy.json
@@ -104,9 +104,9 @@
     },
     "githubUser": {
       "type": "string",
-      "defaultValue": "microsoft",
+      "defaultValue": "Azure",
       "metadata": {
-        "description": "User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
+        "description": "User github account where they have forked https://github.com/Azure/jumpstart-apps"
       }
     },
     "addsDomainName": {
@@ -1406,13 +1406,13 @@
             "githubUser": {
               "type": "string",
               "metadata": {
-                "description": "User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
+                "description": "User github account where they have forked https://github.com/Azure/jumpstart-apps"
               }
             },
             "githubBranch": {
               "type": "string",
               "metadata": {
-                "description": "Git branch to use from the forked repo https://github.com/microsoft/azure-arc-jumpstart-apps"
+                "description": "Git branch to use from the forked repo https://github.com/Azure/jumpstart-apps"
               }
             },
             "k3sArcClusterName": {
diff --git a/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json b/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json
index 95b0711545..4519f9d967 100644
--- a/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json
+++ b/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json
@@ -81,9 +81,9 @@
     "githubUser": {
       "type": "string",
       "metadata": {
-        "description": "User's github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
+        "description": "User's github account where they have forked https://github.com/Azure/jumpstart-apps"
       },
-      "defaultValue": "microsoft"
+      "defaultValue": "Azure"
     },
     "principalId": {
       "type": "string",
diff --git a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json
index 8f0fafc6a8..90506eff5a 100644
--- a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json
+++ b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json
@@ -180,7 +180,7 @@
         "githubUser": {
             "type": "string",
             "metadata": {
-                "description": "User's github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
+                "description": "User's github account where they have forked https://github.com/Azure/jumpstart-apps"
             }
         },
         "k3sArcClusterName": {
@@ -234,7 +234,7 @@
             "Enterprise"
             ]
         }
-        
+
     },
     "variables": {
         "vmName": "[concat(parameters('vmName'))]",
diff --git a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1
index e917fdab73..e11a69177d 100644
--- a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1
+++ b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1
@@ -14,7 +14,7 @@ $Env:AZCOPY_AUTO_LOGIN_TYPE = "MSI"
 
 $certdns = "arcbox.devops.com"
 
-$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
+$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"
 
 $clusters = @(
     [pscustomobject]@{clusterName = $Env:k3sArcDataClusterName; context = "$namingPrefix-k3s-data" ; kubeConfig = "C:\Users\$Env:adminUsername\.kube\config" }
diff --git a/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sGitOps.ps1 b/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sGitOps.ps1
index c1e718897e..da5a22dcc2 100644
--- a/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sGitOps.ps1
+++ b/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sGitOps.ps1
@@ -12,7 +12,7 @@ $ingressNamespace = "ingress-nginx"
 
 $certdns = "arcbox.k3sdevops.com"
 
-$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
+$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"
 
 Start-Transcript -Path $Env:ArcBoxLogsDir\K3sGitOps.log
 
@@ -43,7 +43,7 @@ az k8s-configuration flux create `
     --scope cluster `
     --url $appClonedRepo `
     --branch $Env:githubBranch --sync-interval 3s `
-    --kustomization name=nginx path=./nginx/release
+    --kustomization name=nginx path=./arcbox/nginx/release
 
 # Create GitOps config for Hello-Arc application
 Write-Host "Creating GitOps config for Hello-Arc application"
@@ -56,7 +56,7 @@ az k8s-configuration flux create `
     --scope namespace `
     --url $appClonedRepo `
     --branch $env:githubBranch --sync-interval 3s `
-    --kustomization name=helloarc path=./hello-arc/yaml
+    --kustomization name=helloarc path=./arcbox/hello_arc/yaml
 
 $configs = $(az k8s-configuration flux list --cluster-name $Env:k3sArcClusterName --cluster-type connectedClusters --resource-group $Env:resourceGroup --query "[].name" -otsv)
 
diff --git a/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sRBAC.ps1 b/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sRBAC.ps1
index fb54aab2ef..44da67b271 100644
--- a/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sRBAC.ps1
+++ b/azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sRBAC.ps1
@@ -3,7 +3,7 @@ $Env:k3sArcClusterName=(Get-AzResource -ResourceGroupName $Env:resourceGroup -Re
 $Env:k3sArcClusterName=$Env:k3sArcClusterName -replace "`n",""
 
 $namingPrefix = $Env:namingPrefix
-$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
+$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"
 
 Start-Transcript -Path $Env:ArcBoxLogsDir\K3sRBAC.log
 
diff --git a/azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep b/azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep
index 784714f635..3cec30ac6c 100644
--- a/azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep
+++ b/azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep
@@ -93,10 +93,10 @@ param sqlServerEdition string = 'Developer'
 @description('Choice to deploy Bastion to connect to the client VM')
 param deployBastion bool = false
 
-@description('User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps')
+@description('User github account where they have forked https://github.com/Azure/jumpstart-apps')
 param githubUser string
 
-@description('Git branch to use from the forked repo https://github.com/microsoft/azure-arc-jumpstart-apps')
+@description('Git branch to use from the forked repo https://github.com/Azure/jumpstart-apps')
 param githubBranch string
 
 @description('The name of the K3s cluster')
diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep
index b90705dab3..f0b61b5ad3 100644
--- a/azure_jumpstart_arcbox/bicep/main.bicep
+++ b/azure_jumpstart_arcbox/bicep/main.bicep
@@ -56,8 +56,8 @@ param deployBastion bool = false
 ])
 param bastionSku string = 'Basic'
 
-@description('User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps')
-param githubUser string = 'microsoft'
+@description('User github account where they have forked https://github.com/Azure/jumpstart-apps')
+param githubUser string = 'Azure'
 
 @description('Active directory domain services domain name')
 param addsDomainName string = 'jumpstart.local'
diff --git a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
index 1cd6e2664f..8d67f14d26 100644
--- a/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
+++ b/azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
@@ -544,7 +544,7 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
   params: {
     name: toLower(keyVaultName)
     enablePurgeProtection: false
-    enableSoftDelete: false
+    enableSoftDelete: true
     location: location
   }
 }