diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 3ac011b95ab..3e3b1ce6671 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -7,10 +7,6 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
-
-env:
-  FLUTTER_MIN_VERSION: '3.22.0'
-
 jobs:
   # BEGIN LINTING STAGE
   format:
@@ -18,6 +14,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          channel: main
       - uses: bluefireteam/melos-action@v3
       - run: melos run format-check
 
@@ -27,18 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{env.FLUTTER_MIN_VERSION}}
-      - uses: bluefireteam/melos-action@v3
-      - name: "Analyze with lowest supported version"
-        uses: invertase/github-action-dart-analyzer@v2.0.0
-        with:
-          fatal-infos: true
-
-  analyze-latest:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
+          channel: main
       - uses: bluefireteam/melos-action@v3
       - name: "Analyze with latest stable"
         uses: invertase/github-action-dart-analyzer@v2.0.0
@@ -60,6 +47,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          channel: main
       - uses: bluefireteam/melos-action@v3
       - name: Install DCM
         uses: CQLabs/setup-dcm@v1
@@ -77,6 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
+          channel: main
           cache: true
       - uses: bluefireteam/melos-action@v3
       - name: Run tests
diff --git a/packages/flame/test/_goldens/align_component_1.png b/packages/flame/test/_goldens/align_component_1.png
index be6c17cd025..3c0edc80412 100644
Binary files a/packages/flame/test/_goldens/align_component_1.png and b/packages/flame/test/_goldens/align_component_1.png differ
diff --git a/packages/flame_3d/example/.gitignore b/packages/flame_3d/example/.gitignore
index 29a3a5017f0..79c113f9b50 100644
--- a/packages/flame_3d/example/.gitignore
+++ b/packages/flame_3d/example/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
diff --git a/packages/flame_3d/pubspec.yaml b/packages/flame_3d/pubspec.yaml
index 93eec7fb0c0..425399a95cd 100644
--- a/packages/flame_3d/pubspec.yaml
+++ b/packages/flame_3d/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_gpu:
+    sdk: flutter
   meta: ^1.12.0
   vector_math: ^2.1.4
 
diff --git a/packages/flame_svg/test/_goldens/render_sharply.png b/packages/flame_svg/test/_goldens/render_sharply.png
index 445e79c8913..e915b2dfe24 100644
Binary files a/packages/flame_svg/test/_goldens/render_sharply.png and b/packages/flame_svg/test/_goldens/render_sharply.png differ