diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
index 9f5f46d..3aa6354 100644
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@@ -22,7 +22,11 @@ on:
   workflow_dispatch:
     inputs:
       theia_cloud_tag:
-        description: 'Theia Cloud components tag (operator, service, landing-page). Leave empty to use the tag defined in values.yaml (no override).'
+        description: 'Theia Cloud components tag (operator, service). Leave empty to use the tag defined in values.yaml (no override).'
+        required: false
+        default: ''
+      landing_page_tag:
+        description: 'EduTheia landing page tag. Leave empty to use the tag defined in values.yaml (no override).'
         required: false
         default: ''
       ide_images_tag:
@@ -46,6 +50,7 @@ jobs:
     with:
       environment: test1
       theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
+      landing_page_tag: ${{ inputs.landing_page_tag }}
       ide_images_tag: ${{ inputs.ide_images_tag }}
       helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
       deploy_shared_gateway: false
@@ -64,6 +69,7 @@ jobs:
     with:
       environment: test2
       theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
+      landing_page_tag: ${{ inputs.landing_page_tag }}
       ide_images_tag: ${{ inputs.ide_images_tag }}
       helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
       deploy_shared_gateway: false
@@ -82,6 +88,7 @@ jobs:
     with:
       environment: test3
       theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
+      landing_page_tag: ${{ inputs.landing_page_tag }}
       ide_images_tag: ${{ inputs.ide_images_tag }}
       helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
       deploy_shared_gateway: false
diff --git a/.github/workflows/deploy-theia.yml b/.github/workflows/deploy-theia.yml
index 248c030..592353b 100644
--- a/.github/workflows/deploy-theia.yml
+++ b/.github/workflows/deploy-theia.yml
@@ -46,7 +46,12 @@ on:
         required: true
         type: string
       theia_cloud_tag:
-        description: "Image tag for Theia Cloud components (operator, service, landing-page). Leave empty to use the tag defined in values.yaml (no override)."
+        description: "Image tag for Theia Cloud components (operator, service). Leave empty to use the tag defined in values.yaml (no override)."
+        required: false
+        type: string
+        default: ""
+      landing_page_tag:
+        description: "Image tag for EduTheia landing page. Leave empty to use the tag defined in values.yaml (no override)."
         required: false
         type: string
         default: ""
@@ -229,6 +234,7 @@ jobs:
 
           # Define image tag variables for cleaner command
           THEIA_CLOUD_TAG="${{ inputs.theia_cloud_tag }}"
+          LANDING_PAGE_TAG="${{ inputs.landing_page_tag }}"
           IDE_IMAGES_TAG="${{ inputs.ide_images_tag }}"
 
           # Build base helm command with always-present flags
@@ -244,10 +250,16 @@ jobs:
           # Only override Theia Cloud component images when a tag is explicitly provided
           if [ -n "${THEIA_CLOUD_TAG}" ]; then
             HELM_CMD+=(
-              --set theia-cloud.landingPage.image="ghcr.io/eduide/eduide-cloud/landing-page:${THEIA_CLOUD_TAG}"
               --set theia-cloud.operator.image="ghcr.io/eduide/eduide-cloud/operator:${THEIA_CLOUD_TAG}"
               --set theia-cloud.service.image="ghcr.io/eduide/eduide-cloud/service:${THEIA_CLOUD_TAG}"
-              --set "theia-cloud.preloading.images[0]=ghcr.io/eduide/eduide-cloud/landing-page:${THEIA_CLOUD_TAG}"
+            )
+          fi
+
+          # Only override landing page image when a tag is explicitly provided
+          if [ -n "${LANDING_PAGE_TAG}" ]; then
+            HELM_CMD+=(
+              --set theia-cloud.landingPage.image="ghcr.io/eduide/eduidec-landing-page:${LANDING_PAGE_TAG}"
+              --set "theia-cloud.preloading.images[0]=ghcr.io/eduide/eduidec-landing-page:${LANDING_PAGE_TAG}"
             )
           fi
 
diff --git a/charts/theia-cloud-combined/values.yaml b/charts/theia-cloud-combined/values.yaml
index cc92b94..e397d42 100644
--- a/charts/theia-cloud-combined/values.yaml
+++ b/charts/theia-cloud-combined/values.yaml
@@ -44,14 +44,14 @@ theia-cloud:
       interval: 3
 
   operator:
-    image: ghcr.io/eduide/eduide/operator:latest
+    image: ghcr.io/eduide/eduide-cloud/operator:latest
     replicas: 1
     sessionsPerUser: 10
     storageClassName: csi-rbd-sc
     eagerStart: true
 
   service:
-    image: ghcr.io/eduide/eduide/service:latest
+    image: ghcr.io/eduide/eduide-cloud/service:latest
     # Public token (must match app.id or be set explicitly)
     authToken: nJV3nKZmpxTD4wu2 
     # Secret containing the admin API token, created by the theia-certificates chart
diff --git a/deployments/test1.theia-test.artemis.cit.tum.de/values.yaml b/deployments/test1.theia-test.artemis.cit.tum.de/values.yaml
index fbe4e0a..d142c53 100644
--- a/deployments/test1.theia-test.artemis.cit.tum.de/values.yaml
+++ b/deployments/test1.theia-test.artemis.cit.tum.de/values.yaml
@@ -43,21 +43,21 @@ theia-cloud:
       interval: 3
 
   operator:
-    #image: ghcr.io/eduide/eduide/operator:latest
+    #image: ghcr.io/eduide/eduide-cloud/operator:latest
     #eagerStart: false
     replicas: 1
     sessionsPerUser: 1000 # Needed for load tests - not recommended for production
     storageClassName: csi-rbd-sc
 
   # service:
-  #   image: ghcr.io/eduide/eduide/service:latest
+  #   image: ghcr.io/eduide/eduide-cloud/service:latest
   #   adminApiTokenSecret:
   #     name: service-admin-api-token
   #     key: ADMIN_API_TOKEN
 
   preloading:
     images:
-      - ghcr.io/eduide/eduide/landing-page:latest
+      - ghcr.io/eduide/eduidec-landing-page:latest
       - ghcr.io/eduide/eduide/java-17:latest
       - ghcr.io/eduide/eduide/c:latest
       - ghcr.io/eduide/eduide/javascript:latest
@@ -73,7 +73,7 @@ theia-cloud:
 
   landingPage:
     # We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
-    image: ghcr.io/eduide/eduide/landing-page
+    image: ghcr.io/eduide/eduidec-landing-page
     # We can define a default blueprint
     appDefinition: "java-17-latest"
     ephemeralStorage: true
diff --git a/deployments/test2.theia-test.artemis.cit.tum.de/values.yaml b/deployments/test2.theia-test.artemis.cit.tum.de/values.yaml
index 6c4285d..6bf8d02 100644
--- a/deployments/test2.theia-test.artemis.cit.tum.de/values.yaml
+++ b/deployments/test2.theia-test.artemis.cit.tum.de/values.yaml
@@ -43,21 +43,21 @@ theia-cloud:
       interval: 3
 
   operator:
-    #image: ghcr.io/eduide/eduide/operator:latest
+    #image: ghcr.io/eduide/eduide-cloud/operator:latest
     #eagerStart: false
     replicas: 1
     sessionsPerUser: 10
     storageClassName: csi-rbd-sc
 
   # service:
-  #   image: ghcr.io/eduide/eduide/service:latest
+  #   image: ghcr.io/eduide/eduide-cloud/service:latest
   #   adminApiTokenSecret:
   #     name: service-admin-api-token
   #     key: ADMIN_API_TOKEN
 
   preloading:
     images:
-      - ghcr.io/eduide/eduide/landing-page:latest
+      - ghcr.io/eduide/eduidec-landing-page:latest
       - ghcr.io/eduide/eduide/java-17:latest
       - ghcr.io/eduide/eduide/c:latest
       - ghcr.io/eduide/eduide/javascript:latest
@@ -73,7 +73,7 @@ theia-cloud:
 
   landingPage:
     # We use the try now page as landing page since the default does not support multiple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
-    image: ghcr.io/eduide/eduide/landing-page
+    image: ghcr.io/eduide/eduidec-landing-page
     # We can define a default blueprint
     appDefinition: "java-17-latest"
     ephemeralStorage: true
diff --git a/deployments/test3.theia-test.artemis.cit.tum.de/values.yaml b/deployments/test3.theia-test.artemis.cit.tum.de/values.yaml
index 28276ee..1199741 100644
--- a/deployments/test3.theia-test.artemis.cit.tum.de/values.yaml
+++ b/deployments/test3.theia-test.artemis.cit.tum.de/values.yaml
@@ -43,7 +43,7 @@ theia-cloud:
       interval: 3
 
   operator:
-    image: ghcr.io/eduide/eduide/operator:latest
+    image: ghcr.io/eduide/eduide-cloud/operator:latest
     #eagerStart: false
     replicas: 1
     sessionsPerUser: 10
@@ -55,22 +55,22 @@ theia-cloud:
         ephemeral-storage: "256Mi"
 
   # service:
-  #   image: ghcr.io/eduide/eduide/service:latest
+  #   image: ghcr.io/eduide/eduide-cloud/service:latest
   #   adminApiTokenSecret:
   #     name: service-admin-api-token
   #     key: ADMIN_API_TOKEN
 
   preloading:
     images:
-      - ghcr.io/eduide/eduide/landing-page:latest
+      - ghcr.io/eduide/eduidec-landing-page:latest
       - ghcr.io/eduide/eduide/java-17:latest
       - ghcr.io/eduide/eduide/c:latest
       - ghcr.io/eduide/eduide/javascript:latest
       - ghcr.io/eduide/eduide/ocaml:latest
       - ghcr.io/eduide/eduide/rust:latest
       - ghcr.io/eduide/eduide/python:latest
-      - ghcr.io/eduide/eduide/theia-no-ls:pr-46
-      - ghcr.io/eduide/eduide/langserver-java:pr-46
+      - ghcr.io/eduide/eduide/theia-no-ls:pr-80
+      - ghcr.io/eduide/eduide/langserver-java:pr-80
 
   imagePullPolicy: Always
 
@@ -80,7 +80,7 @@ theia-cloud:
 
   landingPage:
     # We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
-    image: ghcr.io/eduide/eduide/landing-page
+    image: ghcr.io/eduide/eduidec-landing-page
     # We can define a default blueprint
     
     # 1. The actual image data (Must be a Base64 encoded string)
@@ -141,9 +141,9 @@ theia-appdefinitions:
   apps:
     - name: java-ls-test
       image: ghcr.io/eduide/eduide/theia-no-ls
-      imageTag: pr-46
+      imageTag: pr-80
       options:
-        langserver-image: ghcr.io/eduide/eduide/langserver-java:pr-46
+        langserver-image: ghcr.io/eduide/eduide/langserver-java:pr-80
 
 monitoring:
   targetNamespaces:
diff --git a/deployments/theia-staging.artemis.cit.tum.de/values.yaml b/deployments/theia-staging.artemis.cit.tum.de/values.yaml
index eb389e0..5be9f02 100644
--- a/deployments/theia-staging.artemis.cit.tum.de/values.yaml
+++ b/deployments/theia-staging.artemis.cit.tum.de/values.yaml
@@ -42,21 +42,21 @@ theia-cloud:
       interval: 3
 
   operator:
-    #image: ghcr.io/eduide/eduide/operator:latest
+    #image: ghcr.io/eduide/eduide-cloud/operator:latest
     #eagerStart: false
     replicas: 1
     sessionsPerUser: 10
     storageClassName: csi-rbd-sc
 
   # service:
-  #   image: ghcr.io/eduide/eduide/service:latest
+  #   image: ghcr.io/eduide/eduide-cloud/service:latest
   #   adminApiTokenSecret:
   #     name: service-admin-api-token
   #     key: ADMIN_API_TOKEN
 
   preloading:
     images:
-      - ghcr.io/eduide/eduide/landing-page:latest
+      - ghcr.io/eduide/eduidec-landing-page:latest
       - ghcr.io/eduide/eduide/java-17:latest
       - ghcr.io/eduide/eduide/c:latest
       - ghcr.io/eduide/eduide/javascript:latest
@@ -72,7 +72,7 @@ theia-cloud:
 
   landingPage:
     # We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
-    image: ghcr.io/eduide/eduide/landing-page
+    image: ghcr.io/eduide/eduidec-landing-page
     logoFileExtension: "png"
     # We can define a default blueprint
     appDefinition: "java-17-latest"
diff --git a/deployments/theia.artemis.cit.tum.de/values.yaml b/deployments/theia.artemis.cit.tum.de/values.yaml
index e28fa1b..0b90d9d 100644
--- a/deployments/theia.artemis.cit.tum.de/values.yaml
+++ b/deployments/theia.artemis.cit.tum.de/values.yaml
@@ -42,21 +42,21 @@ theia-cloud:
       interval: 3
 
   operator:
-    #image: ghcr.io/eduide/eduide/operator:latest
+    #image: ghcr.io/eduide/eduide-cloud/operator:latest
     #eagerStart: false
     replicas: 3
     sessionsPerUser: 10
     storageClassName: csi-rbd-sc
 
   # service:
-  #   image: ghcr.io/eduide/eduide/service:latest
+  #   image: ghcr.io/eduide/eduide-cloud/service:latest
   #   adminApiTokenSecret:
   #     name: service-admin-api-token
   #     key: ADMIN_API_TOKEN
 
   preloading:
     images:
-      - ghcr.io/eduide/eduide/landing-page:latest
+      - ghcr.io/eduide/eduidec-landing-page:latest
       - ghcr.io/eduide/eduide/java-17:latest
       - ghcr.io/eduide/eduide/c:latest
       - ghcr.io/eduide/eduide/javascript:latest
@@ -72,7 +72,7 @@ theia-cloud:
 
   landingPage:
     # We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
-    image: ghcr.io/eduide/eduide/landing-page
+    image: ghcr.io/eduide/eduidec-landing-page
     logoFileExtension: "png"
     # We can define a default blueprint
     appDefinition: "java-17-latest"
diff --git a/value-reference-files/tum-theia-cloud-helm-test-values.yaml b/value-reference-files/tum-theia-cloud-helm-test-values.yaml
index c49a547..dd225ce 100644
--- a/value-reference-files/tum-theia-cloud-helm-test-values.yaml
+++ b/value-reference-files/tum-theia-cloud-helm-test-values.yaml
@@ -40,14 +40,14 @@ theia-cloud:
       interval: 3
 
   operator:
-    image: ghcr.io/eduide/eduide/operator:pr-22
+    image: ghcr.io/eduide/eduide-cloud/operator:pr-22
     eagerStart: false
     replicas: 1
     sessionsPerUser: 10
     storageClassName: csi-rbd-sc
 
   service:
-    image: ghcr.io/eduide/eduide/service:pr-22
+    image: ghcr.io/eduide/eduide-cloud/service:pr-22
     adminApiTokenSecret:
       name: service-admin-api-token
       key: ADMIN_API_TOKEN