diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml
new file mode 100644
index 0000000..601e995
--- /dev/null
+++ b/.github/workflows/code-check.yml
@@ -0,0 +1,41 @@
+name: Code Check
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+
+      - name: Run Flutter Test
+        run: flutter test
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+
+      - name: Run Flutter Format
+        run: dart format --set-exit-if-changed .
+
+      - name: Run Flutter Analyze
+        run: flutter analyze
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2295050..122d889 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,9 +1,11 @@
 name: release
 on:
   workflow_run:
-    workflows: [Test & Report]
+    workflows: [Code Check]
     types:
       - completed
+    branches:
+      - main
 
 jobs:
   release:
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
deleted file mode 100644
index e3dfe80..0000000
--- a/.github/workflows/test-report.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Test & Report
-
-on:
-  pull_request:
-  push:
-permissions:
-  id-token: write
-  contents: read
-  checks: write
-  statuses: write
-jobs:
-  test:
-    name: Test & Report
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: "stable"
-
-      - name: Get all Flutter Packages
-        run: flutter pub get
-
-      - name: Run Flutter Test
-        run: flutter test --machine > test-results.json
-
-      - name: Test Report
-        uses: dorny/test-reporter@v1
-        if: success() || failure()
-        with:
-          name: Test Results
-          path: test-results.json
-          reporter: dart-json