diff --git a/.github/workflows/selfhosted-client-image.yml b/.github/workflows/selfhosted-client-image.yml
index 2640903a..47368e1e 100644
--- a/.github/workflows/selfhosted-client-image.yml
+++ b/.github/workflows/selfhosted-client-image.yml
@@ -21,9 +21,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: 'Copy Static' # Needed since Github actions does not support symlinks
-      run: cp -r frontend/static nodeapp/static
-
     - name: 'Download basic.selfhosted.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
       uses: dawidd6/action-download-artifact@v6
@@ -31,14 +28,14 @@ jobs:
         workflow: frontend-build.yml
         workflow_conclusion: success
         name: web-basic-selfhosted-js
-        path: nodeapp/static/frontend/
+        path: frontend/static/frontend/
 
     - name: 'Download main.js Artifact for a release'
       if: inputs.semver != ''  # Only if fired as job in release.yml
       uses: actions/download-artifact@v4
       with:
         name: web-basic-selfhosted-js
-        path: nodeapp/static/frontend/
+        path: frontend/static/frontend/
 
     - name: 'Download pro.selfhosted.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
@@ -47,14 +44,14 @@ jobs:
         workflow: frontend-build.yml
         workflow_conclusion: success
         name: web-pro-selfhosted-js
-        path: nodeapp/static/frontend/
+        path: frontend/static/frontend/
 
     - name: 'Download pro.js Artifact for a release'
       if: inputs.semver != ''  # Only if fired as job in release.yml
       uses: actions/download-artifact@v4
       with:
         name: web-pro-selfhosted-js
-        path: nodeapp/static/frontend/
+        path: frontend/static/frontend/
 
     - name: 'Log in to Docker Hub'
       uses: docker/login-action@v3
diff --git a/.github/workflows/web-client-image.yml b/.github/workflows/web-client-image.yml
index d84b475d..473eb44d 100644
--- a/.github/workflows/web-client-image.yml
+++ b/.github/workflows/web-client-image.yml
@@ -31,14 +31,14 @@ jobs:
         workflow: frontend-build.yml
         workflow_conclusion: success
         name: web-main-js
-        path: frontend/static/frontend/
+        path: web/static/frontend/
 
     - name: 'Download main.js Artifact for a release'
       if: inputs.semver != ''  # Only if fired as job in release.yml
       uses: actions/download-artifact@v4
       with:
         name: web-main-js
-        path: frontend/static/frontend/
+        path: web/static/frontend/
 
     - name: 'Download pro.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
@@ -47,14 +47,14 @@ jobs:
         workflow: frontend-build.yml
         workflow_conclusion: success
         name: web-pro-js
-        path: frontend/static/frontend/
+        path: web/static/frontend/
 
     - name: 'Download pro.js Artifact for a release'
       if: inputs.semver != ''  # Only if fired as job in release.yml
       uses: actions/download-artifact@v4
       with:
         name: web-pro-js
-        path: frontend/static/frontend/
+        path: web/static/frontend/
 
     - name: 'Log in to Docker Hub'
       uses: docker/login-action@v3