diff --git a/eng/common/pipelines/templates/steps/prepare-pipelines.yml b/eng/common/pipelines/templates/steps/prepare-pipelines.yml
index d85c48caf..20df9f0f7 100644
--- a/eng/common/pipelines/templates/steps/prepare-pipelines.yml
+++ b/eng/common/pipelines/templates/steps/prepare-pipelines.yml
@@ -13,6 +13,9 @@ parameters:
   - name: TestsConventionOptions
     type: string
     default: ''
+  - name: GenerateUnifiedWeekly
+    type: boolean
+    default: false
 
 steps:
   - template: install-pipeline-generation.yml
@@ -34,7 +37,7 @@ steps:
         --patvar PATVAR
         --debug
         ${{parameters.CIConventionOptions}}
-      displayName: Create CI pipelines for public repository
+      displayName: Create CI Pipelines for Public Repository
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
     - script: >
@@ -52,7 +55,7 @@ steps:
         --patvar PATVAR
         --debug
         ${{parameters.UPConventionOptions}}
-      displayName: Create UP pipelines for public repository
+      displayName: Create UP Pipelines for Public Repository
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
     - script: >
@@ -70,7 +73,7 @@ steps:
         --patvar PATVAR
         --debug
         ${{parameters.TestsConventionOptions}}
-      displayName: Create Live Test pipelines for public repository
+      displayName: Create Live Test Pipelines for Public Repository
       condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
@@ -83,16 +86,36 @@ steps:
         --path $(System.DefaultWorkingDirectory)/sdk
         --endpoint Azure
         --repository ${{parameters.Repository}}
-        --convention weekly
+        --convention testsweekly
         --agentpool Hosted
         --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.TestsConventionOptions}}
-      displayName: Create Weekly (Multi-Cloud) Live Test pipelines for public repository
+      displayName: Create Weekly (Multi-Cloud) Live Test Pipelines for Public Repository
       condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
+    - script: >
+        $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
+        --organization https://dev.azure.com/azure-sdk
+        --project internal
+        --prefix ${{parameters.Prefix}}
+        --devopspath "\${{parameters.Prefix}}"
+        --path $(System.DefaultWorkingDirectory)/sdk
+        --endpoint Azure
+        --repository ${{parameters.Repository}}
+        --convention upweekly
+        --agentpool Hosted
+        --branch refs/heads/$(DefaultBranch)
+        --patvar PATVAR
+        --debug
+        ${{parameters.UPConventionOptions}}
+      displayName: Create Weekly (Multi-Cloud) Unified Test Pipelines for Public Repository
+      condition: and(succeeded(), eq(${{parameters.GenerateUnifiedWeekly}},true))
+      env:
+        PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
+
 
   # This covers our -pr repositories.
   - ${{ if endsWith(parameters.Repository, '-pr')}}:
@@ -112,7 +135,7 @@ steps:
         --debug
         --no-schedule
         ${{parameters.CIConventionOptions}}
-      displayName: Create CI pipelines for private repository
+      displayName: Create CI Pipelines for Private Repository
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
     - script: >
@@ -131,7 +154,7 @@ steps:
         --debug
         --no-schedule
         ${{parameters.UPConventionOptions}}
-      displayName: Create UP pipelines for private repository
+      displayName: Create UP Pipelines for Private Repository
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
     - script: >
@@ -150,7 +173,7 @@ steps:
         --debug
         --no-schedule
         ${{parameters.TestsConventionOptions}}
-      displayName: Create Live Test pipelines for private repository
+      displayName: Create Live Test Pipelines for Private Repository
       condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
       env:
         PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)