diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache
index 9a9fe6e085..b1e6351554 100644
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -23,25 +23,19 @@
     {{/isDebug}}
 
     <link rel="icon" href="images/favicon.png" />
-
-    <script type="importmap">
-      {"imports": {"plugins-runtime": "http://localhost:4200/index.mjs"}}
-    </script>
-
-    <script type="module" src="http://localhost:4200/index.mjs"></script>
-
-    <script>
-      window.penpotTranslations = JSON.parse({{& translations}});
-      window.penpotVersion = "%version%";
-      window.penpotBuildDate = "%buildDate%";
-    </script>
-
     {{# manifest}}
     <script>window.penpotWorkerURI="{{& worker}}"</script>
     <script defer src="{{& config}}"></script>
     <script defer src="{{& polyfills}}"></script>
     {{/manifest}}
 
+    <script type="module" src="{{pluginRuntimeUri}}/index.mjs"></script>
+
+    <script>
+      window.penpotTranslations = JSON.parse({{& translations}});
+      window.penpotVersion = "%version%";
+      window.penpotBuildDate = "%buildDate%";
+    </script>
     <!--cookie-consent-->
   </head>
   <body>
@@ -49,17 +43,10 @@
     {{> ../public/images/sprites/symbol/cursors.svg }}
     <div id="app"></div>
     <section id="modal"></section>
-    {{# manifest}}
 
+    {{# manifest}}
     <script defer src="{{& shared}}"></script>
     <script defer src="{{& main}}"></script>
-
-    <penpot-plugins />
     {{/manifest}}
-
-    <script type="module">
-      import * as runtime from "plugins-runtime";
-      runtime.initialize(globalThis.app.plugins.api);
-    </script>
   </body>
 </html>
diff --git a/frontend/scripts/_helpers.js b/frontend/scripts/_helpers.js
index cb2d36ac96..9633aa488e 100644
--- a/frontend/scripts/_helpers.js
+++ b/frontend/scripts/_helpers.js
@@ -315,9 +315,12 @@ async function generateTemplates() {
     "../public/images/sprites/symbol/cursors.svg": cursorsSprite,
   };
 
+  const pluginRuntimeUri = (process.env.PENPOT_PLUGIN_DEV === "true") ? "http://localhost:4200" : "./plugins-runtime";
+
   content = await renderTemplate("resources/templates/index.mustache", {
     manifest: manifest,
     translations: JSON.stringify(translations),
+    pluginRuntimeUri,
   }, partials);
 
   await fs.writeFile("./resources/public/index.html", content);
@@ -401,6 +404,7 @@ export async function copyAssets() {
 
   await syncDirs("resources/images/", "resources/public/images/");
   await syncDirs("resources/fonts/", "resources/public/fonts/");
+  await syncDirs("resources/plugins-runtime/", "resources/public/plugins-runtime/");
 
   const end = process.hrtime(start);
   log.info("done: copy assets", `(${ppt(end)})`);
diff --git a/frontend/scripts/watch.js b/frontend/scripts/watch.js
index 80dda26b52..56fb84a8e9 100644
--- a/frontend/scripts/watch.js
+++ b/frontend/scripts/watch.js
@@ -64,7 +64,7 @@ h.watch("resources/templates", null, async function (path) {
 });
 
 log.info("watch: assets (~)")
-h.watch(["resources/images", "resources/fonts"], null, async function (path) {
+h.watch(["resources/images", "resources/fonts", "resources/plugins-runtime"], null, async function (path) {
   log.info("changed:", path);
   await h.compileSvgSprites();
   await h.copyAssets();
diff --git a/manage.sh b/manage.sh
index d724fef53a..6e13bb7d6b 100755
--- a/manage.sh
+++ b/manage.sh
@@ -85,7 +85,7 @@ function run-devenv-tmux {
         start-devenv
     fi
 
-    docker exec -ti penpot-devenv-main sudo -EH -u penpot /home/start-tmux.sh
+    docker exec -ti penpot-devenv-main sudo -EH -u penpot PENPOT_PLUGIN_DEV=$PENPOT_PLUGIN_DEV /home/start-tmux.sh
 }
 
 function run-devenv-shell {
