diff --git a/.github/workflows/android-play-store.yml b/.github/workflows/android-play-store.yml
index f88407466e..d008439ace 100644
--- a/.github/workflows/android-play-store.yml
+++ b/.github/workflows/android-play-store.yml
@@ -34,6 +34,9 @@ jobs:
 
       - name: Remove REQUEST_INSTALL_PACKAGES permission
         run: ./patches/remove_request_install_packages_permission.sh
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6a2c9987af..a422ce0fe7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -30,6 +30,9 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
@@ -110,6 +113,9 @@ jobs:
 
       - name: Remove proprietary dependencies
         run: ./patches/remove_proprietary_dependencies.sh
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 093e5331fc..3bf6b5a494 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -36,6 +36,9 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Install Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 7ccd83516a..85250e8c89 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -37,6 +37,9 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
@@ -196,6 +199,9 @@ jobs:
             export RUSTUP_HOME=/opt/rustup
             export PUB_CACHE=build/pub_cache
 
+            echo Removing simulator dependency
+            ./patches/remove_simulator_dependency.sh
+
             echo flutter pub get
             unsudo flutter pub get
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7ff5dc3bbd..c154b20566 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -36,6 +36,9 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Install Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/onyxsdk_pen_tests.yml b/.github/workflows/onyxsdk_pen_tests.yml
index 2b5c813613..ab2b5d8b85 100644
--- a/.github/workflows/onyxsdk_pen_tests.yml
+++ b/.github/workflows/onyxsdk_pen_tests.yml
@@ -26,6 +26,9 @@ jobs:
           packages: libgtk-3-dev libx11-dev pkg-config cmake ninja-build libblkid-dev libsecret-1-dev libjsoncpp-dev ghostscript libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libunwind-dev
           version: 1.0
           execute_install_scripts: true
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b7c93e444..f4a16aa0f8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,6 +31,9 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4b283500be..855370d3f2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -30,6 +30,10 @@ jobs:
           key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
           restore-keys: |
             ${{ runner.OS }}-saber-
+      
+      - name: Remove simulator dependency
+        shell: bash
+        run: ./patches/remove_simulator_dependency.sh
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
diff --git a/patches/remove_simulator_dependency.sh b/patches/remove_simulator_dependency.sh
new file mode 100755
index 0000000000..6e34e22cba
--- /dev/null
+++ b/patches/remove_simulator_dependency.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Remove `simulator` from pubspec.yaml
+sed -i -e '/simulator/d' pubspec.yaml
+
+# Delete `main_simulator.dart` entry point
+rm lib/main_simulator.dart