diff --git a/.github/workflows/coordinator-image.yml b/.github/workflows/coordinator-image.yml
index 52b46f89..4832b3e3 100644
--- a/.github/workflows/coordinator-image.yml
+++ b/.github/workflows/coordinator-image.yml
@@ -21,31 +21,15 @@ jobs:
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success
-        name: web-main-js
-        path: frontend/static/frontend/
+        name: django-main-static
+        path: frontend
 
     - name: 'Download Basic 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/
-
-    - name: 'Download pro.js Artifact'
-      if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v6
-      with:
-        workflow: frontend-build.yml
-        workflow_conclusion: success
-        name: web-pro-js
-        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-js
-        path: frontend/static/frontend/
+        name: django-main-static
+        path: frontend
 
     - name: 'Log in to Docker Hub'
       uses: docker/login-action@v3
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 03ed6dc3..366bff94 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -27,11 +27,21 @@ jobs:
         with:
           node-version: '16'
 
-      - name: Set up frontend dependencies
-        run: |
-          cd frontend
-          npm install
-          npm run build
+      - name: 'Download Basic main.js Artifact'
+        if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: frontend-build.yml
+          workflow_conclusion: success
+          name: desktop-main-static
+          path: desktopApp
+
+      - name: 'Download Basic main.js Artifact for a release'
+        if: inputs.semver != ''  # Only if fired as job in release.yml
+        uses: actions/download-artifact@v4
+        with:
+          name: desktop-main-static
+          path: desktopApp
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml
index 625e6fc4..9f91a262 100644
--- a/.github/workflows/frontend-build.yml
+++ b/.github/workflows/frontend-build.yml
@@ -50,10 +50,10 @@ jobs:
         export NODE_OPTIONS="--max-old-space-size=4096"
         cd frontend
         npm run build
-    - name: 'Archive Web Static Build Results'
+    - name: 'Archive Django Static Build Results'
       uses: actions/upload-artifact@v4
       with:
-        name: web-main-static
+        name: django-main-static
         path: |
           frontend/static
           frontend/templates/frontend/*.html
@@ -71,6 +71,13 @@ jobs:
         path: |
           desktopApp/static
           desktopApp/*.html
+    - name: 'Archive Django Static Build Results'
+      uses: actions/upload-artifact@v4
+      with:
+        name: web-main-static
+        path: |
+          web/static
+          web/*.html
     - name: 'Archive Mobile Build Results'
       uses: actions/upload-artifact@v4
       with:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 7233836e..a6a9c522 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -35,7 +35,7 @@ jobs:
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success
-        name: web-main-static
+        name: django-main-static
         path: frontend
 
     - name: Patch Dockerfile and .env-sample
diff --git a/.github/workflows/selfhosted-client-image.yml b/.github/workflows/selfhosted-client-image.yml
index b8a134eb..a33bed5f 100644
--- a/.github/workflows/selfhosted-client-image.yml
+++ b/.github/workflows/selfhosted-client-image.yml
@@ -21,37 +21,21 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: 'Download basic.selfhosted.js Artifact'
+    - name: 'Download Basic main.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
       uses: dawidd6/action-download-artifact@v6
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success
-        name: web-main-js
-        path: nodeapp/static/frontend/
+        name: nodeapp-main-static
+        path: nodeapp
 
-    - name: 'Download main.js Artifact for a release'
+    - name: 'Download Basic 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: nodeapp/static/frontend/
-
-    - name: 'Download pro.selfhosted.js Artifact'
-      if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v6
-      with:
-        workflow: frontend-build.yml
-        workflow_conclusion: success
-        name: web-pro-js
-        path: nodeapp/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: nodeapp/static/frontend/
+        name: nodeapp-main-static
+        path: nodeapp
 
     - 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 7229b89b..39fdfa23 100644
--- a/.github/workflows/web-client-image.yml
+++ b/.github/workflows/web-client-image.yml
@@ -21,37 +21,21 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: 'Download main.js Artifact'
+    - name: 'Download Basic main.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
       uses: dawidd6/action-download-artifact@v6
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success
-        name: web-main-js
-        path: web/static/frontend/
+        name: web-main-static
+        path: web
 
-    - name: 'Download main.js Artifact for a release'
+    - name: 'Download Basic 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: web/static/frontend/
-
-    - name: 'Download pro.js Artifact'
-      if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v6
-      with:
-        workflow: frontend-build.yml
-        workflow_conclusion: success
-        name: web-pro-js
-        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: web/static/frontend/
+        name: web-main-static
+        path: web
 
     - name: 'Log in to Docker Hub'
       uses: docker/login-action@v3