diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
deleted file mode 100644
index 7e077dc1..00000000
--- a/.github/workflows/dart.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Dart Format
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
-      - name: Install dependencies
-        run: flutter pub get
-
-      - name: Verify Formatting
-        run: dart format --output=none --set-exit-if-changed .
diff --git a/.github/workflows/flutter_analyze.yml b/.github/workflows/flutter_analyze.yml
deleted file mode 100644
index af4a3b7d..00000000
--- a/.github/workflows/flutter_analyze.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Flutter Analyze
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
-      - name: Install dependencies
-        run: flutter pub get
-
-      - name: Analyze
-        run: flutter analyze --fatal-infos --fatal-warnings
diff --git a/.github/workflows/flutter_dart.yml b/.github/workflows/flutter_dart.yml
new file mode 100644
index 00000000..f2cd5a05
--- /dev/null
+++ b/.github/workflows/flutter_dart.yml
@@ -0,0 +1,41 @@
+name: Flutter and Dart Analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Analyze code
+        run: flutter analyze --fatal-infos --fatal-warnings
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Verify formatting
+        run: dart format --output=none --set-exit-if-changed .