diff --git a/.github/workflows/build-platformio.yml b/.github/workflows/build-platformio.yml
index bc7aec7e..6cf05be1 100644
--- a/.github/workflows/build-platformio.yml
+++ b/.github/workflows/build-platformio.yml
@@ -22,4 +22,4 @@ jobs:
 
       - name: Build PlatformIO Project
         working-directory: ./Platformio
-        run: pio run
+        run: pio run --target esp32
diff --git a/.github/workflows/build-simulator.yml b/.github/workflows/build-simulator.yml
index 58eb345c..0b65f84f 100644
--- a/.github/workflows/build-simulator.yml
+++ b/.github/workflows/build-simulator.yml
@@ -3,35 +3,60 @@ name: Simulator Build
 on: [push]
 
 jobs:
-  build-x64:
-
-    runs-on: windows-latest
+  build-ubuntu-x64:
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - uses: actions/setup-python@v4
         with:
-            msbuild-architecture: x64
+          python-version: "3.9"
+      - name: Install PlatformIO Core
+        run: pip install --upgrade platformio
 
-      # You can test your matrix by printing the current dotnet version
-      - name: Build
-        working-directory: ./LVGL Simulator
-        run: MSBuild.exe ./LVGL.Simulator.sln -target:Build /p:Platform="x64"
+      - name: Install SDL2
+        run : sudo apt-get install -y libsdl2-dev
 
-  build-x86:
+      - name: Build PlatformIO Project
+        working-directory: ./Platformio
+        run: pio run --target x64sim
 
-    runs-on: windows-latest
+  
+  # build-x64:
 
-    steps:
-      - uses: actions/checkout@v3
+  #   runs-on: windows-latest
 
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
-        with:
-            msbuild-architecture: x86
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Add msbuild to PATH
+  #       uses: microsoft/setup-msbuild@v1.1
+  #       with:
+  #           msbuild-architecture: x64
+
+  #     # You can test your matrix by printing the current dotnet version
+  #     - name: Build
+  #       working-directory: ./LVGL Simulator
+  #       run: MSBuild.exe ./LVGL.Simulator.sln -target:Build /p:Platform="x64"
+
+  # build-x86:
+
+  #   runs-on: windows-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Add msbuild to PATH
+  #       uses: microsoft/setup-msbuild@v1.1
+  #       with:
+  #           msbuild-architecture: x86
 
-      - name: Build
-        working-directory: ./LVGL Simulator
-        run: MSBuild.exe ./LVGL.Simulator.sln -target:Build /p:Platform="x86"
\ No newline at end of file
+  #     - name: Build
+  #       working-directory: ./LVGL Simulator
+  #       run: MSBuild.exe ./LVGL.Simulator.sln -target:Build /p:Platform="x86"
\ No newline at end of file