diff --git a/.ci/component_descriptor b/.ci/component_descriptor
index fa22596c4..6da6064a3 100755
--- a/.ci/component_descriptor
+++ b/.ci/component_descriptor
@@ -10,7 +10,7 @@ echo "create dummy component descriptor BEGIN"
 
 SOURCE_PATH="$(dirname $0)/.."
 VERSION="$(${SOURCE_PATH}/hack/get-version.sh)"
-REPO_CTX="ghcr.io/openmcp-project"
+REPO_CTX="ghcr.io/openmcp-project/components"
 COMPONENT_DESCRIPTOR_DIR="${SOURCE_PATH}/../${COMPONENT_DESCRIPTOR_DIR}"
 
 VERSION="${VERSION}-dummy" REPO_CTX="${REPO_CTX}" COMPONENT_DESCRIPTOR_DIR="${COMPONENT_DESCRIPTOR_DIR}" python ${SOURCE_PATH}/hack/create-dummy-cd.py
diff --git a/Makefile b/Makefile
index e1d541743..6a79c9822 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ BUILD_OS                                       := "linux"
 BUILD_ARCH                                     := "amd64"
 
 REGISTRY                                       := ghcr.io/openmcp-project
+OCM_REGISTRY                                   := $(REGISTRY)/components
 DOCKER_BUILDER_NAME := "ls-multiarch"
 
 DISABLE_CLEANUP := false
@@ -95,7 +96,7 @@ docker-images: build ## Builds images for all controllers locally. The images ar
 
 .PHONY: component
 component: ocm ## Builds and pushes the Component Descriptor. Also pushes the images and combines them into multi-platform images. Requires the docker images to have been built before.
-	@OCM=$(OCM) $(REPO_ROOT)/hack/generate-cd.sh $(REGISTRY)
+	@OCM=$(OCM) $(REPO_ROOT)/hack/generate-cd.sh $(OCM_REGISTRY)
 
 .PHONY: build-resources ## Wrapper for 'make docker-images component'.
 build-resources: docker-images component
@@ -224,4 +225,4 @@ registry: localbin ## Download registry locally if necessary. If wrong version i
 
 .PHONY: release
 release:
-	@$(REPO_ROOT)/hack/release.sh
\ No newline at end of file
+	@$(REPO_ROOT)/hack/release.sh
diff --git a/charts/container-deployer/values.yaml b/charts/container-deployer/values.yaml
index 6f312f050..c570a5870 100644
--- a/charts/container-deployer/values.yaml
+++ b/charts/container-deployer/values.yaml
@@ -16,29 +16,29 @@ deployer:
   #   kubeconfig: |
   #     <landscaper-cluster-kubeconfig>
 
-#  identity: ""
-#  namespace: ""
+  #  identity: ""
+  #  namespace: ""
   initContainer:
-    repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-init
-#    tag: "latest"
+    repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-init
+  #    tag: "latest"
   waitContainer:
-    repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-wait
-#    tag: "latest"
-#  defaultImage:
-#    repository: ubuntu
-#    tag: latest
+    repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-wait
+  #    tag: "latest"
+  #  defaultImage:
+  #    repository: ubuntu
+  #    tag: latest
   oci:
     allowPlainHttp: false
     insecureSkipVerify: false
     secrets: {}
-#     <name>: <docker config json>
-#  verbosityLevel: info
+  #     <name>: <docker config json>
+  #  verbosityLevel: info
 
-#  targetSelector:
-#  - annotations:
-#    - key:
-#      operator:
-#      value:
+  #  targetSelector:
+  #  - annotations:
+  #    - key:
+  #      operator:
+  #      value:
 
   controller:
     workers: 30
@@ -79,10 +79,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
diff --git a/charts/helm-deployer/values.yaml b/charts/helm-deployer/values.yaml
index 08cf51c8a..22805f607 100644
--- a/charts/helm-deployer/values.yaml
+++ b/charts/helm-deployer/values.yaml
@@ -16,20 +16,20 @@ deployer:
   #   kubeconfig: |
   #     <landscaper-cluster-kubeconfig>
 
-#  identity: ""
+  #  identity: ""
   namespace: ""
   oci:
     allowPlainHttp: false
     insecureSkipVerify: false
     secrets: {}
-#      <name>: <docker config json>
-#  verbosityLevel: info
+  #      <name>: <docker config json>
+  #  verbosityLevel: info
 
-#  targetSelector:
-#  - annotations:
-#    - key:
-#      operator:
-#      value:
+  #  targetSelector:
+  #  - annotations:
+  #    - key:
+  #      operator:
+  #      value:
 
   controller:
     workers: 30
@@ -50,7 +50,7 @@ deployer:
 replicaCount: 1
 
 image:
-  repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/helm-deployer/images/helm-deployer-controller
+  repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/helm-deployer/images/helm-deployer-controller
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   # tag: ""
@@ -70,10 +70,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
diff --git a/charts/manifest-deployer/values.yaml b/charts/manifest-deployer/values.yaml
index f14afae19..da795b7cc 100644
--- a/charts/manifest-deployer/values.yaml
+++ b/charts/manifest-deployer/values.yaml
@@ -16,15 +16,15 @@ deployer:
   #   kubeconfig: |
   #     <landscaper-cluster-kubeconfig>
 
-#  identity: ""
+  #  identity: ""
   namespace: ""
-#  verbosityLevel: info
+  #  verbosityLevel: info
 
-#  targetSelector:
-#  - annotations:
-#    - key:
-#      operator:
-#      value:
+  #  targetSelector:
+  #  - annotations:
+  #    - key:
+  #      operator:
+  #      value:
 
   controller:
     workers: 30
@@ -45,7 +45,7 @@ deployer:
 replicaCount: 1
 
 image:
-  repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/manifest-deployer/images/manifest-deployer-controller
+  repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/manifest-deployer/images/manifest-deployer-controller
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   # tag: ""
@@ -65,10 +65,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
diff --git a/charts/mock-deployer/values.yaml b/charts/mock-deployer/values.yaml
index a70f2872c..4bd8c3618 100644
--- a/charts/mock-deployer/values.yaml
+++ b/charts/mock-deployer/values.yaml
@@ -18,7 +18,7 @@ deployer:
   #   kubeconfig: |
   #     <landscaper-cluster-kubeconfig>
 
-#  identity: ""
+  #  identity: ""
   namespace: ""
 
   # burst and max queries per second settings for k8s client used in reconciliation
@@ -34,7 +34,7 @@ deployer:
       qps: 40
 
 image:
-  repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/mock-deployer/images/mock-deployer-controller
+  repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/mock-deployer/images/mock-deployer-controller
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   #tag: ""
@@ -54,10 +54,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -65,7 +67,8 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/hack/int-test-helper/install-landscaper-dual b/hack/int-test-helper/install-landscaper-dual
index df6b195a0..28f46e6cb 100755
--- a/hack/int-test-helper/install-landscaper-dual
+++ b/hack/int-test-helper/install-landscaper-dual
@@ -58,7 +58,7 @@ if [[ -z $INGRESS_URL ]]; then
     exit 1
 fi
 
-OCI_REPO="ghcr.op/openmcp-project"
+OCI_REPO="ghcr.io/openmcp-project/components"
 COMPONENT_NAME="github.com/openmcp-project/landscaper"
 
 echo "> Pull landscaper charts"