diff --git a/.github/workflows/build_restreamer-ui.yaml b/.github/workflows/build_restreamer-ui.yaml
index be3b6c9..f20f0ab 100644
--- a/.github/workflows/build_restreamer-ui.yaml
+++ b/.github/workflows/build_restreamer-ui.yaml
@@ -19,6 +19,8 @@ jobs:
         run: |
           yarn install
           yarn build
+        env:
+          PUBLIC_URL: './'
 
       - name: Upload React build as artifact
         uses: actions/upload-artifact@v2
@@ -92,7 +94,7 @@ jobs:
           context: .
           file: ./Dockerfile.workflow
           build-args: |
-            PUBLIC_URL=/ui
+            PUBLIC_URL=${{ env.PUBLIC_URL }}
             CADDY_IMAGE=${{ env.CADDY_IMAGE }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
diff --git a/.github/workflows/build_restreamer_dev.yaml b/.github/workflows/build_restreamer_dev.yaml
index 8f82274..39ce5fb 100644
--- a/.github/workflows/build_restreamer_dev.yaml
+++ b/.github/workflows/build_restreamer_dev.yaml
@@ -21,6 +21,8 @@ jobs:
         run: |
           yarn install
           yarn build
+        env:
+          PUBLIC_URL: './'
 
       - name: Upload React build as artifact
         uses: actions/upload-artifact@v2
@@ -92,7 +94,7 @@ jobs:
           context: .
           file: ./Dockerfile.workflow
           build-args: |
-            PUBLIC_URL=/ui
+            PUBLIC_URL=${{ env.PUBLIC_URL }}
             CADDY_IMAGE=${{ env.CADDY_IMAGE }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
diff --git a/.github_build/Build.restreamer-ui.env b/.github_build/Build.restreamer-ui.env
index 2991db6..0495082 100644
--- a/.github_build/Build.restreamer-ui.env
+++ b/.github_build/Build.restreamer-ui.env
@@ -1,2 +1,3 @@
 RELEASE=1.10.0
 CADDY_IMAGE=caddy:2.7.6-alpine
+PUBLIC_URL="./"
\ No newline at end of file
diff --git a/Dockerfile.workflow b/Dockerfile.workflow
index af47d05..ac08c04 100644
--- a/Dockerfile.workflow
+++ b/Dockerfile.workflow
@@ -4,6 +4,8 @@ FROM $CADDY_IMAGE
 COPY build /ui/build
 COPY Caddyfile /ui/Caddyfile
 
+ENV PUBLIC_URL="./"
+
 WORKDIR /ui
 
 EXPOSE 3000