diff --git a/.github/workflows/dev-cicd.yaml b/.github/workflows/dev-cicd.yaml
index 07b02810..4894c519 100644
--- a/.github/workflows/dev-cicd.yaml
+++ b/.github/workflows/dev-cicd.yaml
@@ -73,6 +73,7 @@ jobs:
   deploy:
       needs: build-and-test
       if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
+
       runs-on: ubuntu-latest
 
       steps:
diff --git a/.github/workflows/main-ci.yaml b/.github/workflows/main-ci.yaml
new file mode 100644
index 00000000..fc4be30b
--- /dev/null
+++ b/.github/workflows/main-ci.yaml
@@ -0,0 +1,69 @@
+name: Build And Test
+
+on:
+    push:
+        branches:
+            - main
+    pull_request:
+        branches:
+            - main
+
+jobs:
+    build-and-test:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: "17"
+                  distribution: "corretto"
+
+            - name: Cache Gradle
+              uses: actions/cache@v3
+              with:
+                  path: |
+                      ~/.gradle/caches
+                      ~/.gradle/wrapper
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Build with Gradle
+              run: ./gradlew build -x test --stacktrace --parallel
+
+            - name: Run tests
+              run: ./gradlew test
+
+            - name: Publish Unit Test Results
+              uses: EnricoMi/publish-unit-test-result-action@v2
+              if: always()
+              with:
+                  files: '**/build/test-results/test/TEST-*.xml'
+
+            - name: JUnit Report Action
+              uses: mikepenz/action-junit-report@v3
+              if: always()
+              with:
+                  report_paths: '**/build/test-results/test/TEST-*.xml'
+
+            - name: Store test results
+              uses: actions/upload-artifact@v3
+              if: always()
+              with:
+                  name: test-results
+                  path: '**/build/test-results/test/TEST-*.xml'
+
+            - name: Test Report Summary
+              if: always()
+              run: |
+                  echo '## Test Report Summary' >> $GITHUB_STEP_SUMMARY
+                  echo '```' >> $GITHUB_STEP_SUMMARY
+                  ./gradlew test --console=plain || true
+                  echo '```' >> $GITHUB_STEP_SUMMARY
\ No newline at end of file