diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions
index 2d71228d..17fbfea4 100644
--- a/.ci/pipeline_definitions
+++ b/.ci/pipeline_definitions
@@ -5,7 +5,8 @@ hvpa-controller:
         preprocess:
           'inject-commit-hash'
         inject_effective_version: true
-      component_descriptor: ~
+      component_descriptor:
+        ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots
       publish:
         oci-builder: docker-buildx
         platforms:
@@ -13,7 +14,7 @@ hvpa-controller:
         - linux/arm64
         dockerimages:
           hvpa-controller:
-            image: 'eu.gcr.io/gardener-project/gardener/hvpa-controller'
+            image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/hvpa-controller
             dockerfile: 'Dockerfile'
             inputs:
               repos:
@@ -27,7 +28,9 @@ hvpa-controller:
   jobs:
     head-update:
       traits:
-        component_descriptor: ~
+        component_descriptor:
+          ocm_reposistory_mappings:
+            - repository: europe-docker.pkg.dev/gardener-project/releases
         draft_release: ~
     pull-request:
       traits:
@@ -36,6 +39,12 @@ hvpa-controller:
       traits:
         version:
           preprocess: 'finalize'
+        component_descriptor:
+          ocm_repository: europe-docker.pkg.dev/gardener-project/releases
+        publish:
+          dockerimages:
+            hvpa-controller:
+            image: europe-docker.pkg.dev/gardener-project/releases/gardener/hvpa-controller
         release:
           nextversion: 'bump_minor'
           git_tags:
diff --git a/Makefile b/Makefile
index 97ddafdd..3fc51b15 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,10 @@
 
 VERSION             := $(shell cat VERSION)
 PACKAGES            :="$(go list -e ./... | grep -vE '/tmp/|/vendor/')"
-REGISTRY            := eu.gcr.io/gardener-project/gardener
+REGISTRY            := europe-docker.pkg.dev/gardener-project/public
 REPO_ROOT           := $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
 
-IMAGE_REPOSITORY    := $(REGISTRY)/hvpa-controller
+IMAGE_REPOSITORY    := $(REGISTRY)/gardener/hvpa-controller
 IMAGE_TAG           := $(VERSION)
 
 # Image URL to use all building/pushing image targets