diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml
new file mode 100644
index 0000000..5164cae
--- /dev/null
+++ b/.github/workflows/build-main.yaml
@@ -0,0 +1,66 @@
+name: Build Main
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run 'assemble' with Gradle Wrapper
+        run: ./gradlew assemble distTar
+
+      - name: Run 'check' with Gradle Wrapper
+        run: ./gradlew check
+
+      - name: Upload Detekt Reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: detekt
+          path: ${{ github.workspace }}/build/reports/detekt
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Upload Test Reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test
+          path: ${{ github.workspace }}/**/build/reports/tests/test
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Upload Velocitas SDK
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Velocitas SDK
+          path: ${{ github.workspace }}/sdk/build/libs/sdk.jar
+
+      - name: Upload GrpcClientTestApp
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: GrpcClientTestApp
+          path: ${{ github.workspace }}/GrpcClientTestApp/build/outputs/apk/debug/GrpcClientTestApp-debug.apk
+
+      - name: Upload GrpcServerTestApp
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: GrpcServerTestApp
+          path: ${{ github.workspace }}/GrpcServerTestApp/build/distributions/GrpcServerTestApp.tar
diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
index f27267e..cb61f04 100644
--- a/.github/workflows/build-pull-request.yaml
+++ b/.github/workflows/build-pull-request.yaml
@@ -1,7 +1,8 @@
 name: Validate Pull Request
 
 on:
-  pull_request
+  - pull_request
+  - push
 
 jobs:
   build-project:
@@ -16,10 +17,10 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run 'assemble' with Gradle Wrapper
-        run: ./gradlew assemble
+        run: ./gradlew assemble distTar
 
       - name: Run 'check' with Gradle Wrapper
         run: ./gradlew check
@@ -41,3 +42,24 @@ jobs:
           path: ${{ github.workspace }}/**/build/reports/tests/test
           if-no-files-found: error
           retention-days: 14
+
+      - name: Upload Velocitas SDK
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Velocitas SDK
+          path: ${{ github.workspace }}/sdk/build/libs/sdk.jar
+
+      - name: Upload GrpcClientTestApp
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: GrpcClientTestApp
+          path: ${{ github.workspace }}/GrpcClientTestApp/build/outputs/apk/debug/GrpcClientTestApp-debug.apk
+
+      - name: Upload GrpcServerTestApp
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: GrpcServerTestApp
+          path: ${{ github.workspace }}/GrpcServerTestApp/build/distributions/GrpcServerTestApp.tar