diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00bd589..3a86271 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,10 +34,11 @@ jobs:
           pio settings set force_verbose 1
           pio run --environment ${{ matrix.environment }}
 
-#       - name: Simulate and test ble-advertising with Wokwi
-#         uses: wokwi/wokwi-ci-action@v1
-#         with:
-#           token: ${{ secrets.WOKWI_CLI_TOKEN }}
-#           path: ./${{ matrix.template }}/  # directory with wokwi.toml, relative to repo's root
-#           timeout: 30000
-#           expect_text: 'Puara Start Done!'
+      - name: Simulate and test with Wokwi
+        if: ${{ matrix.environment == 'ESP32-S3' }}
+        uses: wokwi/wokwi-ci-action@v1
+        with:
+          token: ${{ secrets.WOKWI_CLI_TOKEN }}
+          path: ./${{ matrix.template }}/  # directory with wokwi.toml, relative to repo's root
+          timeout: 30000
+          expect_text: 'Puara Start Done!'
diff --git a/libmapper-osc-template/diagram.json b/basic-osc/diagram.json
similarity index 100%
rename from libmapper-osc-template/diagram.json
rename to basic-osc/diagram.json
diff --git a/ble-advertising-template/wokwi.toml b/basic-osc/wokwi.toml
similarity index 100%
rename from ble-advertising-template/wokwi.toml
rename to basic-osc/wokwi.toml
diff --git a/ble-advertising-template/diagram.json b/basic/diagram.json
similarity index 75%
rename from ble-advertising-template/diagram.json
rename to basic/diagram.json
index a468a0c..954a8b9 100644
--- a/ble-advertising-template/diagram.json
+++ b/basic/diagram.json
@@ -4,18 +4,18 @@
   "editor": "wokwi",
   "parts": [
     {
-      "type": "board-esp32-s3-box",
+      "type": "board-esp32-c3-devkitm-1",
       "id": "esp"
     }
   ],
   "connections": [
     [
-      "esp:G43",
+      "esp:TX",
       "$serialMonitor:RX",
       ""
     ],
     [
-      "esp:G44",
+      "esp:RX",
       "$serialMonitor:TX",
       ""
     ]
diff --git a/libmapper-osc-template/wokwi.toml b/basic/wokwi.toml
similarity index 100%
rename from libmapper-osc-template/wokwi.toml
rename to basic/wokwi.toml
diff --git a/ble-advertising/diagram.json b/ble-advertising/diagram.json
new file mode 100644
index 0000000..5acbcf0
--- /dev/null
+++ b/ble-advertising/diagram.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "author": "Uri Shaked",
+  "editor": "wokwi",
+  "parts": [
+    {
+      "type": "board-esp32-s3-devkitc-1",
+      "id": "esp"
+    }
+  ],
+  "connections": [
+    [
+      "esp:TX",
+      "$serialMonitor:RX",
+      ""
+    ],
+    [
+      "esp:RX",
+      "$serialMonitor:TX",
+      ""
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/libmapper-osc/diagram.json b/libmapper-osc/diagram.json
new file mode 100644
index 0000000..954a8b9
--- /dev/null
+++ b/libmapper-osc/diagram.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "author": "Uri Shaked",
+  "editor": "wokwi",
+  "parts": [
+    {
+      "type": "board-esp32-c3-devkitm-1",
+      "id": "esp"
+    }
+  ],
+  "connections": [
+    [
+      "esp:TX",
+      "$serialMonitor:RX",
+      ""
+    ],
+    [
+      "esp:RX",
+      "$serialMonitor:TX",
+      ""
+    ]
+  ]
+}
\ No newline at end of file