diff --git a/.github/workflows/docker.check-build.frontend.selfhosted.yml b/.github/workflows/docker.check-build.dashboard.selfhosted.yml
similarity index 72%
rename from .github/workflows/docker.check-build.frontend.selfhosted.yml
rename to .github/workflows/docker.check-build.dashboard.selfhosted.yml
index 2ccf3a92f..20c443111 100644
--- a/.github/workflows/docker.check-build.frontend.selfhosted.yml
+++ b/.github/workflows/docker.check-build.dashboard.selfhosted.yml
@@ -18,18 +18,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Build and push Frontend (Magic Links)
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: .
-          file: ./apps/magic-link/Dockerfile
-          push: false
-          tags: panoradotdev/frontend-magic-links:selfhosted
-          build-args: |
-            VITE_BACKEND_DOMAIN=${{ secrets.VITE_BACKEND_DOMAIN }}
-
-      - name: Build and push Frontend (Dashboard)
+      - name: Build Frontend (Dashboard)
         uses: docker/build-push-action@v2
         with:
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/docker.check-build.magiclinks.selfhosted.yml b/.github/workflows/docker.check-build.magiclinks.selfhosted.yml
new file mode 100644
index 000000000..0409b9fa3
--- /dev/null
+++ b/.github/workflows/docker.check-build.magiclinks.selfhosted.yml
@@ -0,0 +1,30 @@
+name: Compile Docker Images (Frontend Selfhosted)
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      ENVIRONMENT: SELF_HOSTED
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build Frontend (Magic Links)
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: ./apps/magic-link/Dockerfile
+          push: false
+          tags: panoradotdev/frontend-magic-links:selfhosted
+          build-args: |
+            VITE_BACKEND_DOMAIN=${{ secrets.VITE_BACKEND_DOMAIN }}
\ No newline at end of file
diff --git a/.github/workflows/docker.export.frontend.selfhosted.yml b/.github/workflows/docker.export.frontend-dashboard.selfhosted.yml
similarity index 78%
rename from .github/workflows/docker.export.frontend.selfhosted.yml
rename to .github/workflows/docker.export.frontend-dashboard.selfhosted.yml
index db463deb5..8bd1650c9 100644
--- a/.github/workflows/docker.export.frontend.selfhosted.yml
+++ b/.github/workflows/docker.export.frontend-dashboard.selfhosted.yml
@@ -24,17 +24,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push Frontend (Magic Links)
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: .
-          file: ./apps/magic-link/Dockerfile
-          push: true
-          tags: panoradotdev/frontend-magic-links:selfhosted
-          build-args: |
-            VITE_BACKEND_DOMAIN=${{ secrets.VITE_BACKEND_DOMAIN }}
-
       - name: Build and push Frontend (Dashboard)
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/docker.export.frontend-magiclinks.selfhosted.yml b/.github/workflows/docker.export.frontend-magiclinks.selfhosted.yml
new file mode 100644
index 000000000..678d783e1
--- /dev/null
+++ b/.github/workflows/docker.export.frontend-magiclinks.selfhosted.yml
@@ -0,0 +1,36 @@
+name: Export Docker Images (Frontend Selfhosted)
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      ENVIRONMENT: SELF_HOSTED
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Frontend (Magic Links)
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: ./apps/magic-link/Dockerfile
+          push: true
+          tags: panoradotdev/frontend-magic-links:selfhosted
+          build-args: |
+            VITE_BACKEND_DOMAIN=${{ secrets.VITE_BACKEND_DOMAIN }}
\ No newline at end of file
diff --git a/packages/api/Dockerfile b/packages/api/Dockerfile
index 440ddada4..4368fc77a 100644
--- a/packages/api/Dockerfile
+++ b/packages/api/Dockerfile
@@ -16,7 +16,6 @@ RUN pnpm add -g turbo
 COPY . .
 RUN turbo prune api --docker
 
-# resulat: full/, json/ pnpm-lock.yaml , pnpm-workspace.yaml
 # =======================================================================
 # Add lockfile and package.json's of isolated subworkspace
 FROM base AS installer