diff --git a/.github/workflows/deploy-azure-webapps.yml b/.github/workflows/deploy-azure-webapps.yml
index 229d35bdec2..ae4d7ab38ec 100644
--- a/.github/workflows/deploy-azure-webapps.yml
+++ b/.github/workflows/deploy-azure-webapps.yml
@@ -7,8 +7,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-deploy-1To1Calling:
-    name: Build and Deploy 1To1Calling
+  build-and-deploy-samples:
+    name: Build and Deploy samples
     runs-on: ubuntu-latest
     environment: production
     steps:
@@ -32,9 +32,20 @@ jobs:
         run: rushx package
         working-directory: ./samples/OneToOneCall
 
-      - name: 'Deploy Sample WebApps'
+      - name: 'Deploy One To One Calling Sample WebApp'
         uses: azure/webapps-deploy@v2
         with:
           app-name: 1To1Calling
           publish-profile: ${{ secrets.AZURE_1TO1CALLING_WEBAPP_PUBLISH_PROFILE }}
           package: ./samples/OneToOneCall/dist
+
+      - name: Package Group Calling Sample Artifact
+        run: rushx package
+        working-directory: ./samples/Calling
+
+      - name: 'Deploy Group Calling Sample WebApp'
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: acs-ui-dev-web-calling-hero
+          publish-profile: ${{ secrets.AZURE_GROUPCALLING_WEBAPP_PUBLISH_PROFILE }}
+          package: ./samples/Calling/dist
diff --git a/.github/workflows/private-preview-release.yaml b/.github/workflows/private-preview-release.yaml
index b4f57262d0a..7a7fcaa012e 100644
--- a/.github/workflows/private-preview-release.yaml
+++ b/.github/workflows/private-preview-release.yaml
@@ -24,29 +24,15 @@ jobs:
       - name: Install dependencies
         run: rush install
 
-      # Builds
       - name: Build Packages and Samples
-        run: rush build
-
-      # Package up artifacts for release
-      - name: Package Group Calling Sample Artifact
-        run: rushx package
-        working-directory: ./samples/Calling
-
-      - name: Package Group Chat Sample Artifact
-        run: rushx package
-        working-directory: ./samples/Chat
+        run: rush build -t "@azure/communication-ui"
 
       - name: Package Private-Preview Artifact
         run: npm pack
         working-directory: ./packages/communication-ui/
 
-      # Todo: move chat and groupcall samples to deploy in the same way as one-to-one
       - name: Archive builds
-        run: |
-          7z a group-calling.zip ./samples/Calling/dist/*
-          7z a group-chat.zip ./samples/Chat/dist/*
-          7z a private-preview.zip ./packages/communication-ui/private-preview/*
+        run: 7z a private-preview.zip ./packages/communication-ui/private-preview/*
 
       # Get datetime to name and tag the releases with.
       - name: Get Release names
@@ -61,10 +47,6 @@ jobs:
         with:
           name: PrivatePreview ${{ steps.releasenames.outputs.releasename }}
           tag_name: Release/${{ steps.releasenames.outputs.tagname }}
-          # Todo: move chat and groupcall samples to deploy in the same way as one-to-one
-          files: |
-            group-calling.zip
-            group-chat.zip
-            private-preview.zip
+          files: private-preview.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packages/acs-calling-declarative/jest.config.js b/packages/acs-calling-declarative/jest.config.js
index c1cc200b116..7edca77ce5f 100644
--- a/packages/acs-calling-declarative/jest.config.js
+++ b/packages/acs-calling-declarative/jest.config.js
@@ -28,7 +28,5 @@ module.exports = {
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
-    '/node_modules/'
-  ]
+  transformIgnorePatterns: ['/node_modules/']
 };
diff --git a/packages/acs-chat-declarative/jest.config.js b/packages/acs-chat-declarative/jest.config.js
index b4799b4255f..388f2e9e202 100644
--- a/packages/acs-chat-declarative/jest.config.js
+++ b/packages/acs-chat-declarative/jest.config.js
@@ -40,7 +40,5 @@ module.exports = {
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
-    '/node_modules/'
-  ]
+  transformIgnorePatterns: ['/node_modules/']
 };