diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 57c7045c2b1..92953397229 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,5 +2,7 @@
 # Automation
 ################
 
+* @iscai-msft @msyyc @changlong-liu
+
 # Git Hub bot rules
 /.github/fabricbot.json  @AlexGhiondea @jsquire
diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml
index 88ef2abb153..5c27e8c5d9a 100644
--- a/eng/pipelines/ci.yml
+++ b/eng/pipelines/ci.yml
@@ -20,6 +20,19 @@ parameters:
     default:
     - name: azure-messaging-webpubsubservice
       service: webpubsub
+      branchName: main
+    - name: azure-storage-blob
+      service: storage
+      branchName: feature/storage-autorest
+    - name: azure-storage-queue
+      service: storage
+      branchName: feature/storage-autorest
+    - name: azure-storage-file-datalake
+      service: storage
+      branchName: feature/storage-autorest
+    - name: azure-storage-file-share
+      service: storage
+      branchName: feature/storage-autorest
 
 jobs:
   - job: "AutoRest_Python_CI"
@@ -204,7 +217,7 @@ jobs:
 
       - ${{ if eq(ne(variables['Build.Reason'], 'PullRequest'), 'True') }}:
         - script: |
-            git clone https://github.com/Azure/azure-sdk-for-python.git --depth=1 --branch main $(Build.SourcesDirectory)/regenerated/
+            git clone https://github.com/Azure/azure-sdk-for-python.git $(Build.SourcesDirectory)/regenerated/
           displayName: 'Clone python repo'
 
         - script: |
@@ -214,6 +227,8 @@ jobs:
 
         - ${{ each package in parameters.VerificationPackages }}:
           - script: |
+              git fetch origin
+              git checkout ${{ package.branchName }}
               autorest ./swagger/README.md --use=$(Build.SourcesDirectory)
             displayName: 'Regenerate target package ${{ package.name }}'
             workingDirectory: '$(Build.SourcesDirectory)/regenerated/sdk/${{ package.service }}/${{ package.name }}'