diff --git a/.github/workflows/xrt_ci.yml b/.github/workflows/xrt_ci.yml
index 226333ac7bc..e4fb277df28 100644
--- a/.github/workflows/xrt_ci.yml
+++ b/.github/workflows/xrt_ci.yml
@@ -120,6 +120,8 @@ jobs:
           accessToken: ${{ secrets.ACCESS_TOKEN }} 
           workspaceg: ${{ github.workspace }}
           github-server-url: ${{ secrets.SERVER_URL }}
+          build-cmd: "build22.bat -opt -hip"
+          vs-version: "2022"
 
   apu-package-build:
     needs: authorize
@@ -183,7 +185,8 @@ jobs:
         with:    
           runNumber: ${{ github.run_number }}    
           pipeline: ${{ env.PIPELINE }}    
-          env: ${{ env.ENV }}  
+          env: ${{ env.ENV }}
+          release: ${{ env.RELEASE }}  
           sshKey: ${{ secrets.CI_PRIVATE_SSH_KEY }}    
           accessToken: ${{ secrets.ACCESS_TOKEN }}
           NPATH: ${{ secrets.NPATH }}
@@ -355,4 +358,30 @@ jobs:
       - name: Print test summary URL 
         run: |    
           # echo "test summary URL: ${{ steps.summary.outputs.url }}" >> $GITHUB_STEP_SUMMARY    
-          echo '### [tests logs summary](${{ steps.summary.outputs.url }})' >> $GITHUB_STEP_SUMMARY      
+          echo '### [tests logs summary](${{ steps.summary.outputs.url }})' >> $GITHUB_STEP_SUMMARY 
+
+  cleanup-build:    
+    needs: test-summary    
+    runs-on: [self-hosted, Ubuntu-22.04]    
+    steps:    
+      - name: Checkout private repository    
+        uses: actions/checkout@v3 
+        with:    
+          repository: actions-int/composite-workflows    
+          token: ${{ secrets.ACCESS_TOKEN }}
+          github-server-url: ${{ secrets.SERVER_URL }}    
+          path: composite-workflows 
+          ref: main
+    
+      - name: Use composite action package download     
+        uses: ./composite-workflows/cleanup   
+        with:    
+          runNumber: ${{ github.run_number }}    
+          pipeline: ${{ env.PIPELINE }}    
+          env: ${{ env.ENV }}
+          release: ${{ env.RELEASE }}  
+          sshKey: ${{ secrets.CI_PRIVATE_SSH_KEY }}    
+          accessToken: ${{ secrets.ACCESS_TOKEN }}
+          NPATH: ${{ secrets.NPATH }}
+          USER: ${{ secrets.USER }}
+          github-server-url: ${{ secrets.SERVER_URL }}      
diff --git a/.github/workflows/xrt_master.yml b/.github/workflows/xrt_master.yml
index 756c092c9ae..eb30e6208a5 100644
--- a/.github/workflows/xrt_master.yml
+++ b/.github/workflows/xrt_master.yml
@@ -57,7 +57,7 @@ jobs:
           github-server-url: ${{ secrets.SERVER_URL }}      
           token: ${{ secrets.ACCESS_TOKEN }}      
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
        
       - name: XRT build     
         uses: ./composite-workflows/build
@@ -105,7 +105,7 @@ jobs:
           github-server-url: ${{ secrets.SERVER_URL }}      
           token: ${{ secrets.ACCESS_TOKEN }}      
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
        
       - name: XRT windows build     
         uses: ./composite-workflows/windows-build
@@ -116,6 +116,8 @@ jobs:
           accessToken: ${{ secrets.ACCESS_TOKEN }} 
           workspaceg: ${{ github.workspace }}
           github-server-url: ${{ secrets.SERVER_URL }}
+          build-cmd: "build22.bat -opt -hip"
+          vs-version: "2022"
 
   apu-package-build:
     runs-on: apu
@@ -148,7 +150,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}       
           path: composite-workflows  
-          ref: copy-packages-feature
+          ref: main
        
       - name: Apu package build for XRT     
         uses: ./composite-workflows/apu-package
@@ -183,14 +185,15 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
     
       - name: Use composite action package download     
         uses: ./composite-workflows/package-download   
         with:    
           runNumber: ${{ env.XRT_VERSION_PATCH }}    
           pipeline: ${{ env.PIPELINE }}    
-          env: ${{ env.ENV }}  
+          env: ${{ env.ENV }}
+          release: ${{ env.RELEASE }}  
           sshKey: ${{ secrets.CI_PRIVATE_SSH_KEY }}    
           accessToken: ${{ secrets.ACCESS_TOKEN }}
           NPATH: ${{ secrets.NPATH }}
@@ -424,7 +427,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
     
       - name: Use composite action package download     
         uses: ./composite-workflows/setenv   
@@ -467,7 +470,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
     
       - name: Use composite action release-all-sites download     
         uses: ./composite-workflows/release-all-sites   
@@ -509,7 +512,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
     
       - name: Use composite action release-all-sites download     
         uses: ./composite-workflows/release-all-sites   
@@ -544,7 +547,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
 
       - name: Use composite action artifactory upload     
         uses: ./composite-workflows/artifactory-upload   
@@ -586,7 +589,7 @@ jobs:
           token: ${{ secrets.ACCESS_TOKEN }}
           github-server-url: ${{ secrets.SERVER_URL }}    
           path: composite-workflows 
-          ref: copy-packages-feature
+          ref: main
     
       - name: Use composite action package download     
         uses: ./composite-workflows/gradle-artifactory-upload   
@@ -602,6 +605,32 @@ jobs:
           sshKey: ${{ secrets.CI_PRIVATE_SSH_KEY }}
           runnerName: ${{ runner.name }}
 
+  cleanup-build:    
+    needs: [Release_to_all_sites, gradle-artifactory-upload]    
+    runs-on: [self-hosted, Ubuntu-22.04]    
+    steps:    
+      - name: Checkout private repository    
+        uses: actions/checkout@v3 
+        with:    
+          repository: actions-int/composite-workflows    
+          token: ${{ secrets.ACCESS_TOKEN }}
+          github-server-url: ${{ secrets.SERVER_URL }}    
+          path: composite-workflows 
+          ref: main
+    
+      - name: Use composite action package download     
+        uses: ./composite-workflows/cleanup   
+        with:    
+          runNumber: ${{ github.run_number }}    
+          pipeline: ${{ env.PIPELINE }}    
+          env: ${{ env.ENV }}
+          release: ${{ env.RELEASE }}  
+          sshKey: ${{ secrets.CI_PRIVATE_SSH_KEY }}    
+          accessToken: ${{ secrets.ACCESS_TOKEN }}
+          NPATH: ${{ secrets.NPATH }}
+          USER: ${{ secrets.USER }}
+          github-server-url: ${{ secrets.SERVER_URL }}
+
   notify-slack:  
     needs: [Release_to_all_sites, gradle-artifactory-upload]  
     runs-on: Ubuntu-22.04