diff --git a/exporter/src/app/renderer/bitmap.cljs b/exporter/src/app/renderer/bitmap.cljs
index b1df4a7447..5d81eebb9f 100644
--- a/exporter/src/app/renderer/bitmap.cljs
+++ b/exporter/src/app/renderer/bitmap.cljs
@@ -60,6 +60,7 @@
                     :route "objects"
                     :skip-children skip-children}
             uri    (-> (cf/get :public-uri)
-                       (assoc :path "/render.html")
+                       (u/ensure-path-slash)
+                       (u/join "render.html")
                        (assoc :query (u/map->query-string params)))]
       (bw/exec! (prepare-options uri) (partial render uri)))))
diff --git a/exporter/src/app/renderer/pdf.cljs b/exporter/src/app/renderer/pdf.cljs
index 25bcfc036b..edfdcda1b1 100644
--- a/exporter/src/app/renderer/pdf.cljs
+++ b/exporter/src/app/renderer/pdf.cljs
@@ -35,7 +35,7 @@
                           :object-id object-id
                           :route "objects"}]
               (-> base-uri
-                  (assoc :path "/render.html")
+                  (u/join "render.html")
                   (assoc :query (u/map->query-string params)))))
 
           (sync-page-size! [dom]
@@ -76,6 +76,7 @@
                   (on-object (assoc object :path path))
                   (p/recur (rest objects))))))]
 
-    (let [base-uri (cf/get :public-uri)]
+    (let [base-uri (-> (cf/get :public-uri)
+                       (u/ensure-path-slash))]
       (bw/exec! (prepare-options base-uri)
                 (partial render base-uri)))))
diff --git a/exporter/src/app/renderer/svg.cljs b/exporter/src/app/renderer/svg.cljs
index 73558dbe5f..71da424fb3 100644
--- a/exporter/src/app/renderer/svg.cljs
+++ b/exporter/src/app/renderer/svg.cljs
@@ -349,7 +349,8 @@
                     :object-id (mapv :id objects)
                     :route "objects"}
             uri    (-> (cf/get :public-uri)
-                       (assoc :path "/render.html")
+                       (u/ensure-path-slash)
+                       (u/join "render.html")
                        (assoc :query (u/map->query-string params)))]
       (bw/exec! (prepare-options uri)
                 (partial render uri)))))
diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache
index f80b7e7759..60c6119fd0 100644
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -31,7 +31,6 @@
       globalThis.penpotVersion = "{{& version}}";
       globalThis.penpotVersionTag = "{{& version_tag}}";
       globalThis.penpotBuildDate = "{{& build_date}}";
-      globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
     </script>
 
     {{# manifest}}
diff --git a/frontend/resources/templates/rasterizer.mustache b/frontend/resources/templates/rasterizer.mustache
index 90a7f1dfdc..6a3d815e29 100644
--- a/frontend/resources/templates/rasterizer.mustache
+++ b/frontend/resources/templates/rasterizer.mustache
@@ -9,7 +9,6 @@
       globalThis.penpotVersion = "{{& version}}";
       globalThis.penpotVersionTag = "{{& version_tag}}";
       globalThis.penpotBuildDate = "{{& build_date}}";
-      globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
     </script>
 
     {{# manifest}}
diff --git a/frontend/scripts/_helpers.js b/frontend/scripts/_helpers.js
index dd2e23c348..c3c9a9d575 100644
--- a/frontend/scripts/_helpers.js
+++ b/frontend/scripts/_helpers.js
@@ -209,7 +209,6 @@ async function generateManifest() {
     config: "./js/config.js?version=" + VERSION_TAG,
     polyfills: "./js/polyfills.js?version=" + VERSION_TAG,
     libs: "./js/libs.js?version=" + VERSION_TAG,
-    worker_main: "./js/worker/main.js?version=" + VERSION_TAG,
     default_translations: "./js/translation.en.js?version=" + VERSION_TAG,
 
     importmap: JSON.stringify({
diff --git a/frontend/src/app/config.cljs b/frontend/src/app/config.cljs
index f07d5514e0..703f888f91 100644
--- a/frontend/src/app/config.cljs
+++ b/frontend/src/app/config.cljs
@@ -156,9 +156,9 @@
 (def privacy-policy-uri   (obj/get global "penpotPrivacyPolicyURI"))
 (def flex-help-uri        (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/"))
 (def grid-help-uri        (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/"))
-(def plugins-list-uri     (obj/get global "penpotPluginsListUri" "https://penpot.app/penpothub/plugins"))
+(def plugins-list-uri     (obj/get global "penpotPluginsListURI" "https://penpot.app/penpothub/plugins"))
 (def plugins-whitelist    (into #{} (obj/get global "penpotPluginsWhitelist" [])))
-(def templates-uri        (obj/get global "penpotTemplatesUri" "https://penpot.github.io/penpot-files/"))
+(def templates-uri        (obj/get global "penpotTemplatesURI" "https://penpot.github.io/penpot-files/"))
 (def upload-chunk-size    (obj/get global "penpotUploadChunkSize" (* 1024 1024 25))) ;; 25 MiB
 
 ;; We set the current parsed flags under common for make
@@ -185,7 +185,10 @@
       public-uri))
 
 (def worker-uri
-  (obj/get global "penpotWorkerURI" "/js/worker/main.js"))
+  (-> public-uri
+      (u/join "js/worker/main.js")
+      (get :path)
+      (str "?version=" version-tag)))
 
 (defn external-feature-flag
   [flag value]
diff --git a/frontend/src/app/util/worker.cljs b/frontend/src/app/util/worker.cljs
index b23bbbee92..8d87a76795 100644
--- a/frontend/src/app/util/worker.cljs
+++ b/frontend/src/app/util/worker.cljs
@@ -90,8 +90,8 @@
   "Return a initialized webworker instance."
   [path on-error]
   (let [instance (js/Worker. path)
-        bus     (rx/subject)
-        worker  (Worker. instance (rx/to-observable bus))
+        bus      (rx/subject)
+        worker   (Worker. instance (rx/to-observable bus))
 
         handle-message
         (fn [event]