diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/uxbox/config.cljs
index ce37abdb1..1e93bdd69 100644
--- a/frontend/src/uxbox/config.cljs
+++ b/frontend/src/uxbox/config.cljs
@@ -16,13 +16,8 @@
     (gobj/get location "origin")))
 
 (let [config (gobj/get goog.global "uxboxConfig")
-      backend-url (gobj/get config "backendURL" "http://localhost:6060")]
+      public-url (gobj/get config "publicURL" "http://localhost:6060")]
 
   (def default-language "en")
   (def demo-warning (gobj/get config "demoWarning" true))
-
-  (def url
-    (if (= backend-url "samesite")
-      (get-current-origin)
-      backend-url)))
-
+  (def url public-url))
diff --git a/manage.sh b/manage.sh
index 7d43b6bf2..4dcba56c8 100755
--- a/manage.sh
+++ b/manage.sh
@@ -55,7 +55,7 @@ function build-frontend {
            --mount source=`pwd`,type=bind,target=/home/uxbox/uxbox \
            --mount source=${HOME}/.m2,type=bind,target=/home/uxbox/.m2 \
            -w /home/uxbox/uxbox/frontend \
-           -e UXBOX_BACKEND_URL=${UXBOX_BACKEND_URL} \
+           -e UXBOX_PUBLIC_URL=${UXBOX_PUBLIC_URL} \
            -e UXBOX_DEMO_WARNING=${UXBOX_DEMO_WARNING} \
            $IMAGE ./scripts/build-app.sh
 }