diff --git a/pxtarget.json b/pxtarget.json
index 8a21111ec3..964af8816f 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -522,15 +522,7 @@
         "emptyRunCode": "pxsim.pxtcore.updateScreen(new pxsim.RefImage(160, 120, 4))",
         "aspectRatio": 0.85,
         "dynamicBoardDefinition": true,
-        "keymap": true,
-        "messageSimulators": {
-            "jacdac": {
-                "url": "https://microsoft.github.io/jacdac-docs/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$",
-                "localHostUrl": "http://localhost:8000/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$",
-                "aspectRatio": "0.89",
-                "permanent": true
-            }
-        }
+        "keymap": true
     },
     "appTheme": {
         "logoUrl": "https://makecode.com/org",
diff --git a/targetconfig.json b/targetconfig.json
index 088e159446..7a48e67b0c 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -16,6 +16,7 @@
             "microsoft/pxt-tilemaps",
             "microsoft/pxt-skillmap-sample",
             "microsoft/pxt-jacdac",
+            "jacdac/pxt-jacdac",
             "mr-coxall/turtle-logo",
             "microsoft/arcade-storytelling",
             "microsoft/arcade-background-scroll",
@@ -95,7 +96,16 @@
             },
             "microsoft/pxt-skillmap-sample": {},
             "microsoft/pxt-jacdac": {
-                "tags": [ "Hardware" ]
+                "tags": [ "Hardware" ],
+                "upgrades": [ "move:jacdac/pxt-jacdac" ],
+                "hidden": true
+            },
+            "jacdac/pxt-jacdac": {
+                "tags": [ "Hardware" ],
+                "simx": {
+                    "sha": "80d8581b59c501e4cdfaf8ec84e00682264dd9f6",
+                    "devUrl": "https://jacdac.github.io/jacdac-docs/tools/makecode-sim/"
+                }
             },
             "microsoft/arcade-storytelling": {
                 "preferred": true,
@@ -198,10 +208,7 @@
         "upgrades": {
             "microsoft/pxt-tilemaps": "min:v1.8.1",
             "microsoft/arcade-sprite-data": "min:v0.0.6"
-        },
-        "approvedEditorExtensionUrls": [
-            "https://microsoft.github.io/jacdac-docs/tools/makecode-editor-extension"
-        ]
+        }
     },
     "shareLinks": {
         "approved": [