diff --git a/infra/feast-operator/api/v1alpha1/featurestore_types.go b/infra/feast-operator/api/v1alpha1/featurestore_types.go
index 10519106b2..8f63d32800 100644
--- a/infra/feast-operator/api/v1alpha1/featurestore_types.go
+++ b/infra/feast-operator/api/v1alpha1/featurestore_types.go
@@ -260,11 +260,15 @@ type OnlineStoreFilePersistence struct {
 // OnlineStoreDBStorePersistence configures the DB store persistence for the offline store service
 type OnlineStoreDBStorePersistence struct {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase;milvus
 =======
 	// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase
 >>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
+=======
+	// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase;milvus
+>>>>>>> 524506b31 (feat: Add milvus package to release image & option to Operator (#4870))
 	Type string `json:"type"`
 	// Data store parameters should be placed as-is from the "feature_store.yaml" under the secret key. "registry_type" & "type" fields should be removed.
 	SecretRef corev1.LocalObjectReference `json:"secretRef"`
@@ -312,6 +316,7 @@ var ValidOnlineStoreDBStorePersistenceTypes = []string{
 	"elasticsearch",
 	"qdrant",
 	"couchbase",
+<<<<<<< HEAD
 <<<<<<< HEAD
 	"milvus",
 =======
@@ -323,6 +328,9 @@ type OnlineStoreFilePersistence struct {
 >>>>>>> 863a82cb7 (feat: Added feast Go operator db stores support (#4771))
 =======
 >>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
+=======
+	"milvus",
+>>>>>>> 524506b31 (feat: Add milvus package to release image & option to Operator (#4870))
 }
 
 // LocalRegistryConfig configures the deployed registry service
diff --git a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
index 131cac6be9..5169e87365 100644
--- a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
+++ b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
@@ -987,6 +987,7 @@ spec:
                                 - elasticsearch
                                 - qdrant
                                 - couchbase
+                                - milvus
                                 type: string
                             required:
                             - secretRef
@@ -2617,6 +2618,7 @@ spec:
                                     - elasticsearch
                                     - qdrant
                                     - couchbase
+                                    - milvus
                                     type: string
                                 required:
                                 - secretRef
diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
index 5976317d9b..02fd653f3f 100644
--- a/infra/feast-operator/dist/install.yaml
+++ b/infra/feast-operator/dist/install.yaml
@@ -995,6 +995,7 @@ spec:
                                 - elasticsearch
                                 - qdrant
                                 - couchbase
+                                - milvus
                                 type: string
                             required:
                             - secretRef
@@ -2625,6 +2626,7 @@ spec:
                                     - elasticsearch
                                     - qdrant
                                     - couchbase
+                                    - milvus
                                     type: string
                                 required:
                                 - secretRef
diff --git a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile
index 9262ef62bc..c2f1aada44 100644
--- a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile
+++ b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile
@@ -8,7 +8,7 @@ RUN pip install "feast[aws,gcp,snowflake,redis,go,mysql,postgres,opentelemetry,g
 FROM python:3.11-slim-bullseye
 
 RUN pip install --no-cache-dir pip --upgrade
-RUN pip install --no-cache-dir "feast[aws,gcp,snowflake,redis,go,mysql,postgres,opentelemetry,grpcio,k8s,duckdb]"
+RUN pip install --no-cache-dir "feast[aws,gcp,snowflake,redis,go,mysql,postgres,opentelemetry,grpcio,k8s,duckdb,milvus]"
 
 
 RUN apt update && apt install -y -V ca-certificates lsb-release wget && \