diff --git a/Makefile b/Makefile
index 6b8cb85c2..65b4ab1b3 100644
--- a/Makefile
+++ b/Makefile
@@ -102,10 +102,12 @@ deploy-kind: check-env-docker-repo git-commit-sha manifests deploy-namespace-rba
 	kustomize build config/crd | kubectl apply -f -
 	kustomize build config/default/overlays/kind | sed 's@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f -
 
+QUAY_IO_OPERATOR_IMAGE ?= quay.io/rabbitmqoperator/cluster-operator:latest
 # Builds a single-file installation manifest to deploy the Operator
 generate-installation-manifest:
 	mkdir -p releases
 	kustomize build config/installation/ > releases/rabbitmq-cluster-operator.yaml
+	ytt -f releases/rabbitmq-cluster-operator.yaml -f config/ytt/overlay-manager-image.yaml --data-value operator_image=$(QUAY_IO_OPERATOR_IMAGE) > releases/rabbitmq-cluster-operator-quay-io.yaml
 
 # Build the docker image
 docker-build: check-env-docker-repo git-commit-sha
diff --git a/config/ytt/overlay-manager-image.yaml b/config/ytt/overlay-manager-image.yaml
new file mode 100644
index 000000000..e39c255b7
--- /dev/null
+++ b/config/ytt/overlay-manager-image.yaml
@@ -0,0 +1,13 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+
+#@overlay/match by=overlay.subset({"kind": "Deployment", "metadata":{"name": "rabbitmq-cluster-operator"}}), expects="1+"
+---
+spec:
+  template:
+    spec:
+      containers:
+        #@overlay/match by="name", expects="1+"
+        - name: operator
+          image: #@ data.values.operator_image
+