diff --git a/api/core/v1alpha2/cvicondition/condition.go b/api/core/v1alpha2/cvicondition/condition.go
index 9481e3012..9e3500c56 100644
--- a/api/core/v1alpha2/cvicondition/condition.go
+++ b/api/core/v1alpha2/cvicondition/condition.go
@@ -16,27 +16,41 @@ limitations under the License.
 
 package cvicondition
 
+// Type represents the various condition types for the `ClusterVirtualImage`.
 type Type = string
 
 const (
+	// DatasourceReadyType indicates whether the datasource (for example, a `VirtualImage`) is ready, allowing the import process for the `ClusterVirtualImage` to start.
 	DatasourceReadyType Type = "DatasourceReady"
-	ReadyType           Type = "Ready"
+	// ReadyType indicates whether the import process succeeded and the `ClusterVirtualImage` is ready for use.
+	ReadyType Type = "Ready"
 )
 
 type (
+	// DatasourceReadyReason represents the various reasons for the DatasourceReady condition type.
 	DatasourceReadyReason = string
-	ReadyReason           = string
+	// ReadyReason represents the various reasons for the Ready condition type.
+	ReadyReason = string
 )
 
 const (
-	DatasourceReadyReason_DatasourceReady                 DatasourceReadyReason = "DatasourceReady"
-	DatasourceReadyReason_ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
-	DatasourceReadyReason_ImageNotReady                   DatasourceReadyReason = "ImageNotReady"
-	DatasourceReadyReason_ClusterImageNotReady            DatasourceReadyReason = "ClusterImageNotReady"
-
-	ReadyReason_WaitForUserUpload      ReadyReason = "WaitForUserUpload"
-	ReadyReason_Provisioning           ReadyReason = "Provisioning"
-	ReadyReason_ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
-	ReadyReason_ProvisioningFailed     ReadyReason = "ProvisioningFailed"
-	ReadyReason_Ready                  ReadyReason = "Ready"
+	// DatasourceReady indicates that the datasource is ready for use, allowing the import process to start.
+	DatasourceReady DatasourceReadyReason = "DatasourceReady"
+	// ContainerRegistrySecretNotFound indicates that the container registry secret was not found, which prevents the import process from starting.
+	ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
+	// ImageNotReady indicates that the `VirtualImage` datasource is not ready yet, which prevents the import process from starting.
+	ImageNotReady DatasourceReadyReason = "ImageNotReady"
+	// ClusterImageNotReady indicates that the `ClusterVirtualImage` datasource is not ready, which prevents the import process from starting.
+	ClusterImageNotReady DatasourceReadyReason = "ClusterImageNotReady"
+
+	// WaitForUserUpload indicates that the `ClusterVirtualImage` is waiting for the user to upload a datasource for the import process to continue.
+	WaitForUserUpload ReadyReason = "WaitForUserUpload"
+	// Provisioning indicates that the provisioning process is currently in progress.
+	Provisioning ReadyReason = "Provisioning"
+	// ProvisioningNotStarted indicates that the provisioning process has not started yet.
+	ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
+	// ProvisioningFailed indicates that the provisioning process has failed.
+	ProvisioningFailed ReadyReason = "ProvisioningFailed"
+	// Ready indicates that the import process is complete and the `ClusterVirtualImage` is ready for use.
+	Ready ReadyReason = "Ready"
 )
diff --git a/api/core/v1alpha2/vdcondition/condition.go b/api/core/v1alpha2/vdcondition/condition.go
index c1ed3c6ee..31db83508 100644
--- a/api/core/v1alpha2/vdcondition/condition.go
+++ b/api/core/v1alpha2/vdcondition/condition.go
@@ -16,35 +16,56 @@ limitations under the License.
 
 package vdcondition
 
+// Type represents the various condition types for the `VirtualDisk`.
 type Type = string
 
 const (
+	// DatasourceReadyType indicates whether the data source (for example, a `VirtualImage`) is ready, allowing the import process for the `VirtualDisk` to start.
 	DatasourceReadyType Type = "DatasourceReady"
-	ReadyType           Type = "Ready"
-	ResizedType         Type = "Resized"
+	// ReadyType indicates whether the import process succeeded and the `VirtualDisk` is ready for use.
+	ReadyType Type = "Ready"
+	// ResizedType indicates whether the disk resizing operation is completed.
+	ResizedType Type = "Resized"
 )
 
 type (
+	// DatasourceReadyReason represents the various reasons for the DatasourceReady condition type.
 	DatasourceReadyReason = string
-	ReadyReason           = string
-	ResizedReason         = string
+	// ReadyReason represents the various reasons for the Ready condition type.
+	ReadyReason = string
+	// ResizedReason represents the various reasons for the Resized condition type.
+	ResizedReason = string
 )
 
 const (
-	DatasourceReadyReason_DatasourceReady                 DatasourceReadyReason = "DatasourceReady"
-	DatasourceReadyReason_ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
-	DatasourceReadyReason_ImageNotReady                   DatasourceReadyReason = "ImageNotReady"
-	DatasourceReadyReason_ClusterImageNotReady            DatasourceReadyReason = "ClusterImageNotReady"
-
-	ReadyReason_WaitForUserUpload      ReadyReason = "WaitForUserUpload"
-	ReadyReason_Provisioning           ReadyReason = "Provisioning"
-	ReadyReason_ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
-	ReadyReason_ProvisioningFailed     ReadyReason = "ProvisioningFailed"
-	ReadyReason_Ready                  ReadyReason = "Ready"
-	ReadyReason_Lost                   ReadyReason = "PVCLost"
-
-	ResizedReason_NotRequested     ResizedReason = "NotRequested"
-	ResizedReason_InProgress       ResizedReason = "InProgress"
-	ResizedReason_TooSmallDiskSize ResizedReason = "TooSmallDiskSize"
-	ResizedReason_Resized          ResizedReason = "Resized"
+	// DatasourceReady indicates that the datasource is ready for use, allowing the import process to start.
+	DatasourceReady DatasourceReadyReason = "DatasourceReady"
+	// ContainerRegistrySecretNotFound indicates that the container registry secret was not found, which prevents the import process from starting.
+	ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
+	// ImageNotReady indicates that the `VirtualImage` datasource is not ready yet, which prevents the import process from starting.
+	ImageNotReady DatasourceReadyReason = "ImageNotReady"
+	// ClusterImageNotReady indicates that the `VirtualDisk` datasource is not ready, which prevents the import process from starting.
+	ClusterImageNotReady DatasourceReadyReason = "ClusterImageNotReady"
+
+	// WaitForUserUpload indicates that the `VirtualDisk` is waiting for the user to upload a datasource for the import process to continue.
+	WaitForUserUpload ReadyReason = "WaitForUserUpload"
+	// Provisioning indicates that the provisioning process is currently in progress.
+	Provisioning ReadyReason = "Provisioning"
+	// ProvisioningNotStarted indicates that the provisioning process has not started yet.
+	ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
+	// ProvisioningFailed indicates that the provisioning process has failed.
+	ProvisioningFailed ReadyReason = "ProvisioningFailed"
+	// Ready indicates that the import process is complete and the `VirtualDisk` is ready for use.
+	Ready ReadyReason = "Ready"
+	// Lost indicates that the underlying PersistentVolumeClaim has been lost and the `VirtualDisk` can no longer be used.
+	Lost ReadyReason = "PVCLost"
+
+	// NotRequested indicates that the resize operation has not been requested yet.
+	NotRequested ResizedReason = "NotRequested"
+	// InProgress indicates that the resize request has been detected and the operation is currently in progress.
+	InProgress ResizedReason = "InProgress"
+	// TooSmallDiskSize indicates that the requested disk size is too small for the resize operation.
+	TooSmallDiskSize ResizedReason = "TooSmallDiskSize"
+	// Resized indicates that the resize operation has been successfully completed.
+	Resized ResizedReason = "Resized"
 )
diff --git a/api/core/v1alpha2/vicondition/condition.go b/api/core/v1alpha2/vicondition/condition.go
index ff546860d..d7aa2d54c 100644
--- a/api/core/v1alpha2/vicondition/condition.go
+++ b/api/core/v1alpha2/vicondition/condition.go
@@ -16,27 +16,41 @@ limitations under the License.
 
 package vicondition
 
+// Type represents the various condition types for the `VirtualImage`.
 type Type = string
 
 const (
+	// DatasourceReadyType indicates whether the datasource (for example, a `VirtualImage`) is ready, allowing the import process for the `VirtualImage` to start.
 	DatasourceReadyType Type = "DatasourceReady"
-	ReadyType           Type = "Ready"
+	// ReadyType indicates whether the import process succeeded and the `VirtualImage` is ready for use.
+	ReadyType Type = "Ready"
 )
 
 type (
+	// DatasourceReadyReason represents the various reasons for the DatasourceReady condition type.
 	DatasourceReadyReason = string
-	ReadyReason           = string
+	// ReadyReason represents the various reasons for the Ready condition type.
+	ReadyReason = string
 )
 
 const (
-	DatasourceReadyReason_DatasourceReady                 DatasourceReadyReason = "DatasourceReady"
-	DatasourceReadyReason_ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
-	DatasourceReadyReason_ImageNotReady                   DatasourceReadyReason = "ImageNotReady"
-	DatasourceReadyReason_ClusterImageNotReady            DatasourceReadyReason = "ClusterImageNotReady"
-
-	ReadyReason_WaitForUserUpload      ReadyReason = "WaitForUserUpload"
-	ReadyReason_Provisioning           ReadyReason = "Provisioning"
-	ReadyReason_ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
-	ReadyReason_ProvisioningFailed     ReadyReason = "ProvisioningFailed"
-	ReadyReason_Ready                  ReadyReason = "Ready"
+	// DatasourceReady indicates that the datasource is ready for use, allowing the import process to start.
+	DatasourceReady DatasourceReadyReason = "DatasourceReady"
+	// ContainerRegistrySecretNotFound indicates that the container registry secret was not found, which prevents the import process from starting.
+	ContainerRegistrySecretNotFound DatasourceReadyReason = "ContainerRegistrySecretNotFound"
+	// ImageNotReady indicates that the `VirtualImage` datasource is not ready yet, which prevents the import process from starting.
+	ImageNotReady DatasourceReadyReason = "ImageNotReady"
+	// ClusterImageNotReady indicates that the `VirtualImage` datasource is not ready, which prevents the import process from starting.
+	ClusterImageNotReady DatasourceReadyReason = "ClusterImageNotReady"
+
+	// WaitForUserUpload indicates that the `VirtualImage` is waiting for the user to upload a datasource for the import process to continue.
+	WaitForUserUpload ReadyReason = "WaitForUserUpload"
+	// Provisioning indicates that the provisioning process is currently in progress.
+	Provisioning ReadyReason = "Provisioning"
+	// ProvisioningNotStarted indicates that the provisioning process has not started yet.
+	ProvisioningNotStarted ReadyReason = "ProvisioningNotStarted"
+	// ProvisioningFailed indicates that the provisioning process has failed.
+	ProvisioningFailed ReadyReason = "ProvisioningFailed"
+	// Ready indicates that the import process is complete and the `VirtualImage` is ready for use.
+	Ready ReadyReason = "Ready"
 )
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/datasource_ready.go b/images/virtualization-artifact/pkg/controller/cvi/internal/datasource_ready.go
index 50882f8ae..d1d860a7f 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/datasource_ready.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/datasource_ready.go
@@ -66,19 +66,19 @@ func (h DatasourceReadyHandler) Handle(ctx context.Context, cvi *virtv2.ClusterV
 	switch {
 	case err == nil:
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.DatasourceReadyReason_DatasourceReady
+		condition.Reason = cvicondition.DatasourceReady
 		condition.Message = ""
 	case errors.Is(err, source.ErrSecretNotFound):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.DatasourceReadyReason_ContainerRegistrySecretNotFound
+		condition.Reason = cvicondition.ContainerRegistrySecretNotFound
 		condition.Message = service.CapitalizeFirstLetter(err.Error())
 	case errors.As(err, &source.ImageNotReadyError{}):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.DatasourceReadyReason_ImageNotReady
+		condition.Reason = cvicondition.ImageNotReady
 		condition.Message = service.CapitalizeFirstLetter(err.Error())
 	case errors.As(err, &source.ClusterImageNotReadyError{}):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.DatasourceReadyReason_ClusterImageNotReady
+		condition.Reason = cvicondition.ClusterImageNotReady
 		condition.Message = service.CapitalizeFirstLetter(err.Error())
 	}
 
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go
index dc6b6b051..ab46e4420 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go
@@ -73,7 +73,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 		ds.logger.Info("Finishing...", "cvi", cvi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -91,7 +91,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 		ds.logger.Info("Cleaning up...", "cvi", cvi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
@@ -108,7 +108,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 		ds.logger.Info("Create importer pod...", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", "nil")
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -128,12 +128,12 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = cvicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = cvicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -147,7 +147,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go
index 800fd9498..bcf74fa33 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go
@@ -79,7 +79,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 		ds.logger.Info("Finishing...", "cvi", cvi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -98,7 +98,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 		ds.logger.Info("Cleaning up...", "cvi", cvi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		var envSettings *importer.Settings
@@ -118,7 +118,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 		ds.logger.Info("Ready", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", "nil")
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -137,12 +137,12 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = cvicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = cvicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -151,7 +151,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go
index 396b19e38..b731622f0 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go
@@ -81,7 +81,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 		ds.logger.Info("Finishing...", "cvi", cvi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -99,7 +99,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 		ds.logger.Info("Cleaning up...", "cvi", cvi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		envSettings := ds.getEnvSettings(cvi, supgen)
@@ -115,7 +115,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 		ds.logger.Info("Create importer pod...", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", "nil")
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -134,12 +134,12 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = cvicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = cvicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -148,7 +148,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtua
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/sources.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/sources.go
index 23c2449ea..081b0cd05 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/source/sources.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/source/sources.go
@@ -83,5 +83,5 @@ func CleanUp(ctx context.Context, cvi *virtv2.ClusterVirtualImage, c Cleaner) (b
 }
 
 func isDiskProvisioningFinished(c metav1.Condition) bool {
-	return c.Reason == cvicondition.ReadyReason_Ready
+	return c.Reason == cvicondition.Ready
 }
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go
index d837112fc..298ae91b9 100644
--- a/images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go
+++ b/images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go
@@ -88,7 +88,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 		ds.logger.Info("Finishing...", "cvi", cvi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -106,7 +106,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 		ds.logger.Info("Cleaning up...", "cvi", cvi.Name)
 	case pod == nil && svc == nil && ing == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		envSettings := ds.getEnvSettings(supgen)
@@ -121,7 +121,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 		ds.logger.Info("Create uploader pod...", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", nil)
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = cvicondition.ReadyReason_Ready
+		condition.Reason = cvicondition.Ready
 		condition.Message = ""
 
 		cvi.Status.Phase = virtv2.ImageReady
@@ -141,12 +141,12 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = cvicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = cvicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = cvicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -155,7 +155,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_Provisioning
+		condition.Reason = cvicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
@@ -171,7 +171,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualI
 		ds.logger.Info("Provisioning...", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", pod.Status.Phase)
 	default:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = cvicondition.ReadyReason_WaitForUserUpload
+		condition.Reason = cvicondition.WaitForUserUpload
 		condition.Message = "Waiting for the user upload."
 
 		cvi.Status.Phase = virtv2.ImageWaitForUserUpload
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready.go b/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready.go
index e02097200..caf299606 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready.go
@@ -74,22 +74,22 @@ func (h DatasourceReadyHandler) Handle(ctx context.Context, vd *virtv2.VirtualDi
 	switch {
 	case err == nil:
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.DatasourceReadyReason_DatasourceReady
+		condition.Reason = vdcondition.DatasourceReady
 		condition.Message = ""
 		return reconcile.Result{}, nil
 	case errors.Is(err, source.ErrSecretNotFound):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.DatasourceReadyReason_ContainerRegistrySecretNotFound
+		condition.Reason = vdcondition.ContainerRegistrySecretNotFound
 		condition.Message = service.CapitalizeFirstLetter(err.Error()) + "."
 		return reconcile.Result{}, nil
 	case errors.As(err, &source.ImageNotReadyError{}):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.DatasourceReadyReason_ImageNotReady
+		condition.Reason = vdcondition.ImageNotReady
 		condition.Message = service.CapitalizeFirstLetter(err.Error()) + "."
 		return reconcile.Result{}, nil
 	case errors.As(err, &source.ClusterImageNotReadyError{}):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.DatasourceReadyReason_ClusterImageNotReady
+		condition.Reason = vdcondition.ClusterImageNotReady
 		condition.Message = service.CapitalizeFirstLetter(err.Error()) + "."
 		return reconcile.Result{}, nil
 	default:
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready_test.go b/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready_test.go
index e4b152bae..ccbc90921 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready_test.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready_test.go
@@ -68,7 +68,7 @@ func TestDatasourceReadyHandler_Handle(t *testing.T) {
 		condition := vd.Status.Conditions[0]
 		require.Equal(t, vdcondition.DatasourceReadyType, condition.Type)
 		require.Equal(t, metav1.ConditionTrue, condition.Status)
-		require.Equal(t, vdcondition.DatasourceReadyReason_DatasourceReady, condition.Reason)
+		require.Equal(t, vdcondition.DatasourceReady, condition.Reason)
 	})
 
 	t.Run("VirtualDisk with Non Blank DataSource", func(t *testing.T) {
@@ -87,6 +87,6 @@ func TestDatasourceReadyHandler_Handle(t *testing.T) {
 		condition := vd.Status.Conditions[0]
 		require.Equal(t, vdcondition.DatasourceReadyType, condition.Type)
 		require.Equal(t, metav1.ConditionTrue, condition.Status)
-		require.Equal(t, vdcondition.DatasourceReadyReason_DatasourceReady, condition.Reason)
+		require.Equal(t, vdcondition.DatasourceReady, condition.Reason)
 	})
 }
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go b/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
index a3ec3f2da..27c65284b 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
@@ -73,7 +73,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (r
 		return reconcile.Result{}, nil
 	}
 
-	if readyCondition.Status != metav1.ConditionTrue && readyCondition.Reason != vdcondition.ReadyReason_Lost && h.sources.Changed(ctx, vd) {
+	if readyCondition.Status != metav1.ConditionTrue && readyCondition.Reason != vdcondition.Lost && h.sources.Changed(ctx, vd) {
 		vd.Status = virtv2.VirtualDiskStatus{
 			Phase:              virtv2.DiskPending,
 			Conditions:         vd.Status.Conditions,
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go b/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go
index 80c62def6..9792881d6 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/resizing.go
@@ -62,7 +62,7 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 	newSize := vd.Spec.PersistentVolumeClaim.Size
 	if newSize == nil {
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ResizedReason_NotRequested
+		condition.Reason = vdcondition.NotRequested
 		condition.Message = ""
 		return reconcile.Result{}, nil
 	}
@@ -70,7 +70,7 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 	readyCondition, ok := service.GetCondition(vdcondition.ReadyType, vd.Status.Conditions)
 	if !ok || readyCondition.Status != metav1.ConditionTrue {
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ResizedReason_NotRequested
+		condition.Reason = vdcondition.NotRequested
 		condition.Message = ""
 		return reconcile.Result{}, nil
 	}
@@ -86,15 +86,15 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 	}
 
 	if newSize.Equal(pvc.Status.Capacity[corev1.ResourceStorage]) {
-		if condition.Reason == vdcondition.ResizedReason_InProgress {
+		if condition.Reason == vdcondition.InProgress {
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ResizedReason_Resized
+			condition.Reason = vdcondition.Resized
 			condition.Message = ""
 			return reconcile.Result{}, nil
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ResizedReason_NotRequested
+		condition.Reason = vdcondition.NotRequested
 		condition.Message = ""
 		return reconcile.Result{}, nil
 	}
@@ -103,12 +103,12 @@ func (h ResizingHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 	switch {
 	case err == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ResizedReason_InProgress
+		condition.Reason = vdcondition.InProgress
 		condition.Message = "The virtual disk is in the process of resizing."
 		return reconcile.Result{}, nil
 	case errors.Is(err, service.ErrTooSmallDiskSize):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ResizedReason_TooSmallDiskSize
+		condition.Reason = vdcondition.TooSmallDiskSize
 		condition.Message = "The new size of the virtual disk must not be smaller than the current size."
 		return reconcile.Result{}, nil
 	default:
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
index e7d955d44..83db6f731 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
@@ -77,15 +77,15 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 		switch {
 		case pvc == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
 		case pv == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName)
 		default:
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ReadyReason_Ready
+			condition.Reason = vdcondition.Ready
 			condition.Message = ""
 		}
 
@@ -119,7 +119,7 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "PVC Provisioner not found: create the new one."
 
 		vd.Status.Progress = "0%"
@@ -130,7 +130,7 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 	case common.IsDataVolumeComplete(dv):
 		vd.Status.Phase = virtv2.DiskReady
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.ReadyReason_Ready
+		condition.Reason = vdcondition.Ready
 		condition.Message = ""
 
 		vd.Status.Progress = "100%"
@@ -155,19 +155,19 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 		case err == nil:
 			vd.Status.Phase = virtv2.DiskProvisioning
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Provisioning
+			condition.Reason = vdcondition.Provisioning
 			condition.Message = "Import is in the process of provisioning to PVC."
 			return false, nil
 		case errors.Is(err, service.ErrStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Provided StorageClass not found in the cluster."
 			return false, nil
 		case errors.Is(err, service.ErrDefaultStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
 		default:
 			return false, err
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
index b17457b36..885ed7dec 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
@@ -94,17 +94,17 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 		case pvc == nil:
 			vd.Status.Phase = virtv2.DiskLost
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
 		case pv == nil:
 			vd.Status.Phase = virtv2.DiskLost
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName)
 		default:
 			vd.Status.Phase = virtv2.DiskReady
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ReadyReason_Ready
+			condition.Reason = vdcondition.Ready
 			condition.Message = ""
 		}
 
@@ -131,7 +131,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 	case pod == nil:
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		vd.Status.Progress = "0%"
@@ -151,12 +151,12 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vdcondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -171,7 +171,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vd.Status.Progress = ds.statService.GetProgress(vd.GetUID(), pod, vd.Status.Progress, service.NewScaleOption(0, 50))
@@ -185,7 +185,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 			switch {
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -208,7 +208,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "PVC Provisioner not found: create the new one."
 
 		vd.Status.Progress = "50%"
@@ -219,7 +219,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 	case common.IsDataVolumeComplete(dv):
 		vd.Status.Phase = virtv2.DiskReady
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.ReadyReason_Ready
+		condition.Reason = vdcondition.Ready
 		condition.Message = ""
 
 		vd.Status.Progress = "100%"
@@ -244,19 +244,19 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 		case err == nil:
 			vd.Status.Phase = virtv2.DiskProvisioning
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Provisioning
+			condition.Reason = vdcondition.Provisioning
 			condition.Message = "Import is in the process of provisioning to PVC."
 			return false, nil
 		case errors.Is(err, service.ErrStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Provided StorageClass not found in the cluster."
 			return false, nil
 		case errors.Is(err, service.ErrDefaultStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
 			return false, nil
 		default:
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
index d02d810c5..8e9f00e25 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
@@ -84,15 +84,15 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 		switch {
 		case pvc == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
 		case pv == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName)
 		default:
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ReadyReason_Ready
+			condition.Reason = vdcondition.Ready
 			condition.Message = ""
 		}
 
@@ -132,7 +132,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "PVC Provisioner not found: create the new one."
 
 		vd.Status.Progress = "0%"
@@ -143,7 +143,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 	case common.IsDataVolumeComplete(dv):
 		vd.Status.Phase = virtv2.DiskReady
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.ReadyReason_Ready
+		condition.Reason = vdcondition.Ready
 		condition.Message = ""
 
 		vd.Status.Progress = "100%"
@@ -168,19 +168,19 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 		case err == nil:
 			vd.Status.Phase = virtv2.DiskProvisioning
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Provisioning
+			condition.Reason = vdcondition.Provisioning
 			condition.Message = "Import is in the process of provisioning to PVC."
 			return false, nil
 		case errors.Is(err, service.ErrStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Provided StorageClass not found in the cluster."
 			return false, nil
 		case errors.Is(err, service.ErrDefaultStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
 			return false, nil
 		default:
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
index 2daf8c5e1..dddb66993 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
@@ -99,15 +99,15 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 		switch {
 		case pvc == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
 		case pv == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName)
 		default:
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ReadyReason_Ready
+			condition.Reason = vdcondition.Ready
 			condition.Message = ""
 		}
 
@@ -142,7 +142,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		vd.Status.Progress = "0%"
@@ -156,12 +156,12 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vdcondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -171,7 +171,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		vd.Status.Progress = ds.statService.GetProgress(vd.GetUID(), pod, vd.Status.Progress, service.NewScaleOption(0, 50))
@@ -190,7 +190,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 			switch {
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -213,7 +213,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "PVC Provisioner not found: create the new one."
 
 		vd.Status.Progress = "50%"
@@ -224,7 +224,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 	case common.IsDataVolumeComplete(dv):
 		vd.Status.Phase = virtv2.DiskReady
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.ReadyReason_Ready
+		condition.Reason = vdcondition.Ready
 		condition.Message = ""
 
 		vd.Status.Progress = "100%"
@@ -249,19 +249,19 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 		case err == nil:
 			vd.Status.Phase = virtv2.DiskProvisioning
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Provisioning
+			condition.Reason = vdcondition.Provisioning
 			condition.Message = "Import is in the process of provisioning to PVC."
 			return false, nil
 		case errors.Is(err, service.ErrStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Provided StorageClass not found in the cluster."
 			return false, nil
 		case errors.Is(err, service.ErrDefaultStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
 			return false, nil
 		default:
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
index e86c1f0e3..be1f701b9 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
@@ -87,5 +87,5 @@ func CleanUpSupplements(ctx context.Context, vd *virtv2.VirtualDisk, c Cleaner)
 }
 
 func isDiskProvisioningFinished(c metav1.Condition) bool {
-	return c.Reason == vdcondition.ReadyReason_Ready || c.Reason == vdcondition.ReadyReason_Lost
+	return c.Reason == vdcondition.Ready || c.Reason == vdcondition.Lost
 }
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
index 657a7f5be..41643b1f5 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
@@ -107,15 +107,15 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 		switch {
 		case pvc == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
 		case pv == nil:
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Lost
+			condition.Reason = vdcondition.Lost
 			condition.Message = fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName)
 		default:
 			condition.Status = metav1.ConditionTrue
-			condition.Reason = vdcondition.ReadyReason_Ready
+			condition.Reason = vdcondition.Ready
 			condition.Message = ""
 		}
 
@@ -153,7 +153,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 
 		vd.Status.Phase = virtv2.DiskPending
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		vd.Status.Progress = "0%"
@@ -167,12 +167,12 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vdcondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -183,7 +183,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 		if !ds.statService.IsUploadStarted(vd.GetUID(), pod) {
 			vd.Status.Phase = virtv2.DiskWaitForUserUpload
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_WaitForUserUpload
+			condition.Reason = vdcondition.WaitForUserUpload
 			condition.Message = "Waiting for the user upload."
 
 			ds.logger.Info("WaitForUserUpload...", "vd", vd.Name, "progress", vd.Status.Progress, "pod.phase", pod.Status.Phase)
@@ -193,7 +193,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vd.Status.Progress = ds.statService.GetProgress(vd.GetUID(), pod, vd.Status.Progress, service.NewScaleOption(0, 50))
@@ -212,7 +212,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 			switch {
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vdcondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -235,7 +235,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vdcondition.ReadyReason_Provisioning
+		condition.Reason = vdcondition.Provisioning
 		condition.Message = "PVC Provisioner not found: create the new one."
 
 		vd.Status.Progress = "50%"
@@ -246,7 +246,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 	case common.IsDataVolumeComplete(dv):
 		vd.Status.Phase = virtv2.DiskReady
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vdcondition.ReadyReason_Ready
+		condition.Reason = vdcondition.Ready
 		condition.Message = ""
 
 		vd.Status.Progress = "100%"
@@ -271,19 +271,19 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 		case err == nil:
 			vd.Status.Phase = virtv2.DiskProvisioning
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_Provisioning
+			condition.Reason = vdcondition.Provisioning
 			condition.Message = "Import is in the process of provisioning to PVC."
 			return false, nil
 		case errors.Is(err, service.ErrStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Provided StorageClass not found in the cluster."
 			return false, nil
 		case errors.Is(err, service.ErrDefaultStorageClassNotFound):
 			vd.Status.Phase = virtv2.DiskFailed
 			condition.Status = metav1.ConditionFalse
-			condition.Reason = vdcondition.ReadyReason_ProvisioningFailed
+			condition.Reason = vdcondition.ProvisioningFailed
 			condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
 			return false, nil
 		default:
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/datasource_ready.go b/images/virtualization-artifact/pkg/controller/vi/internal/datasource_ready.go
index 44ffb6671..46d9e4cda 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/datasource_ready.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/datasource_ready.go
@@ -67,15 +67,15 @@ func (h DatasourceReadyHandler) Handle(ctx context.Context, vi *virtv2.VirtualIm
 	switch {
 	case err == nil:
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.DatasourceReadyReason_DatasourceReady
+		condition.Reason = vicondition.DatasourceReady
 		condition.Message = ""
 	case errors.Is(err, source.ErrSecretNotFound):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.DatasourceReadyReason_ContainerRegistrySecretNotFound
+		condition.Reason = vicondition.ContainerRegistrySecretNotFound
 		condition.Message = strings.ToTitle(err.Error())
 	case errors.As(err, &source.ImageNotReadyError{}):
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.DatasourceReadyReason_ImageNotReady
+		condition.Reason = vicondition.ImageNotReady
 		condition.Message = strings.ToTitle(err.Error())
 	}
 
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go
index c705dd054..4d3582c84 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go
@@ -71,7 +71,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (boo
 		ds.logger.Info("Finishing...", "vi", vi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -88,7 +88,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (boo
 		ds.logger.Info("Cleaning up...", "vi", vi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		vi.Status.Phase = virtv2.ImageProvisioning
@@ -105,7 +105,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (boo
 		ds.logger.Info("Create importer pod...", "vi", vi.Name, "progress", vi.Status.Progress, "pod.phase", "nil")
 	case cc.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -125,12 +125,12 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (boo
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -144,7 +144,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (boo
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref.go
index 5c4bf15ff..91323082c 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref.go
@@ -77,7 +77,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Finishing...", "vi", vi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -95,7 +95,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Cleaning up...", "vi", vi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		var envSettings *importer.Settings
@@ -115,7 +115,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Ready", "vi", vi.Name, "progress", vi.Status.Progress, "pod.phase", "nil")
 	case cc.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -134,12 +134,12 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -148,7 +148,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/registry.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/registry.go
index 75f7abdfb..48ed9b199 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/registry.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/registry.go
@@ -79,7 +79,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Finishing...", "vi", vi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -96,7 +96,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Cleaning up...", "vi", vi.Name)
 	case pod == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		envSettings := ds.getEnvSettings(vi, supgen)
@@ -112,7 +112,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		ds.logger.Info("Create importer pod...", "vi", vi.Name, "progress", vi.Status.Progress, "pod.phase", "nil")
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -131,12 +131,12 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -145,7 +145,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage)
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vi.Status.Phase = virtv2.ImageProvisioning
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go
index 582ed4253..a6cfc5f24 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go
@@ -83,5 +83,5 @@ func CleanUp(ctx context.Context, vi *virtv2.VirtualImage, c Cleaner) (bool, err
 }
 
 func isDiskProvisioningFinished(c metav1.Condition) bool {
-	return c.Reason == vicondition.ReadyReason_Ready
+	return c.Reason == vicondition.Ready
 }
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/upload.go
index 652277e71..7aef1d795 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/upload.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/upload.go
@@ -86,7 +86,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 		ds.logger.Info("Finishing...", "vi", vi.Name)
 
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -103,7 +103,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 		ds.logger.Info("Cleaning up...", "vi", vi.Name)
 	case pod == nil && svc == nil && ing == nil:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "DVCR Provisioner not found: create the new one."
 
 		envSettings := ds.getEnvSettings(supgen)
@@ -118,7 +118,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 		ds.logger.Info("Create uploader pod...", "vi", vi.Name, "progress", vi.Status.Progress, "pod.phase", nil)
 	case common.IsPodComplete(pod):
 		condition.Status = metav1.ConditionTrue
-		condition.Reason = vicondition.ReadyReason_Ready
+		condition.Reason = vicondition.Ready
 		condition.Message = ""
 
 		vi.Status.Phase = virtv2.ImageReady
@@ -138,12 +138,12 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 			switch {
 			case errors.Is(err, service.ErrNotInitialized), errors.Is(err, service.ErrNotScheduled):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningNotStarted
+				condition.Reason = vicondition.ProvisioningNotStarted
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			case errors.Is(err, service.ErrProvisioningFailed):
 				condition.Status = metav1.ConditionFalse
-				condition.Reason = vicondition.ReadyReason_ProvisioningFailed
+				condition.Reason = vicondition.ProvisioningFailed
 				condition.Message = service.CapitalizeFirstLetter(err.Error() + ".")
 				return false, nil
 			default:
@@ -152,7 +152,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 		}
 
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_Provisioning
+		condition.Reason = vicondition.Provisioning
 		condition.Message = "Import is in the process of provisioning to DVCR."
 
 		vi.Status.Phase = virtv2.ImageProvisioning
@@ -168,7 +168,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vi *virtv2.VirtualImage) (b
 		ds.logger.Info("Provisioning...", "vi", vi.Name, "progress", vi.Status.Progress, "pod.phase", pod.Status.Phase)
 	default:
 		condition.Status = metav1.ConditionFalse
-		condition.Reason = vicondition.ReadyReason_WaitForUserUpload
+		condition.Reason = vicondition.WaitForUserUpload
 		condition.Message = "Waiting for the user upload."
 
 		vi.Status.Phase = virtv2.ImageWaitForUserUpload