diff --git a/Makefile b/Makefile
index 5162ba9..f873826 100644
--- a/Makefile
+++ b/Makefile
@@ -29,14 +29,14 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # quay.io/eclipse/kubernetes-image-puller-operator-bundle:$VERSION and quay.io/eclipse/kubernetes-image-puller-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= quay.io/aandriienko/kubernetes-image-puller-operator
+IMAGE_TAG_BASE ?= quay.io/eclipse/kubernetes-image-puller-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/aandriienko/kubernetes-image-puller-operator:0.0.9
+IMG ?= quay.io/eclipse/kubernetes-image-puller-operator:0.0.9
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 
@@ -248,4 +248,4 @@ bundle-pre-release:
 	sed -i -e "s/\(name: kubernetes-imagepuller-operator.v\).*/\1$${version}/" "$${csvFileRelease}"
 	sed -ri "s/version: [0-9]+.[0-9]+.[0-9]/version: $${version}/g" "$${csvFileRelease}"
 	sed -ri "s/replaces: kubernetes-imagepuller-operator.v[0-9]+.[0-9]+.[0-9]/replaces: kubernetes-imagepuller-operator.$${previousPackageVersion}/g" "$${csvFileRelease}"
-	sed -ri "s|image: quay.io/aandriienko/kubernetes-image-puller-operator:next|image: quay.io/aandriienko/kubernetes-image-puller-operator:$${version}|g" "$${csvFileRelease}"
+	sed -ri "s|image: quay.io/eclipse/kubernetes-image-puller-operator:next|image: quay.io/eclipse/kubernetes-image-puller-operator:$${version}|g" "$${csvFileRelease}"
diff --git a/bundle/manifests/kubernetes-imagepuller-operator.clusterserviceversion.yaml b/bundle/manifests/kubernetes-imagepuller-operator.clusterserviceversion.yaml
index f047858..c8cd444 100644
--- a/bundle/manifests/kubernetes-imagepuller-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/kubernetes-imagepuller-operator.clusterserviceversion.yaml
@@ -101,7 +101,7 @@ spec:
                       fieldPath: metadata.name
                 - name: OPERATOR_NAME
                   value: kubernetes-image-puller-operator
-                image: quay.io/aandriienko/kubernetes-image-puller-operator:next
+                image: quay.io/eclipse/kubernetes-image-puller-operator:next
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 6922741..aa429ac 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/aandriienko/kubernetes-image-puller-operator-bundle
-  newTag: next
+  newName: quay.io/eclipse/kubernetes-image-puller-operator
+  newTag: 0.0.9
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index e782151..818e415 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: kubernetes-image-puller-operator
       containers:
       - name: kubernetes-image-puller-operator
-        image: quay.io/aandriienko/kubernetes-image-puller-operator:next
+        image: quay.io/eclipse/kubernetes-image-puller-operator:next
         command:
         - /manager
         args:
diff --git a/deploy/olm-catalog/catalogsource.yaml b/deploy/olm-catalog/catalogsource.yaml
index a60202f..f0e1c3b 100644
--- a/deploy/olm-catalog/catalogsource.yaml
+++ b/deploy/olm-catalog/catalogsource.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: quay.io/aandriienko/image-puller-catalog-source:latest
+  image: quay.io/eclipse/image-puller-catalog-source:latest
   updateStrategy:
     registryPoll:
       interval: 5m