diff --git a/pkg/controller/che/create.go b/pkg/controller/che/create.go
index f5cbe25aa..6f25006b8 100644
--- a/pkg/controller/che/create.go
+++ b/pkg/controller/che/create.go
@@ -509,7 +509,11 @@ func (r *ReconcileChe) GenerateAndSaveFields(instance *orgv1.CheCluster, request
 			return err
 		}
 	}
-	pvcJobsImage := util.GetValue(instance.Spec.Storage.PvcJobsImage, deploy.DefaultPvcJobsImage)
+	defaultPVCJobsImage := deploy.DefaultPvcJobsUpstreamImage
+	if cheFlavor == "codeready" {
+		defaultPVCJobsImage = deploy.DefaultPvcJobsImage
+	}
+	pvcJobsImage := util.GetValue(instance.Spec.Storage.PvcJobsImage, defaultPVCJobsImage)
 	if len(instance.Spec.Storage.PvcJobsImage) < 1 {
 		instance.Spec.Storage.PvcJobsImage = pvcJobsImage
 		if err := r.UpdateCheCRSpec(instance, "pvc jobs image", pvcJobsImage); err != nil {
diff --git a/pkg/deploy/che_configmap.go b/pkg/deploy/che_configmap.go
index 222a60223..31db86313 100644
--- a/pkg/deploy/che_configmap.go
+++ b/pkg/deploy/che_configmap.go
@@ -136,7 +136,12 @@ func GetConfigMapData(cr *orgv1.CheCluster) (cheEnv map[string]string) {
 	pvcStrategy := util.GetValue(cr.Spec.Storage.PvcStrategy, DefaultPvcStrategy)
 	pvcClaimSize := util.GetValue(cr.Spec.Storage.PvcClaimSize, DefaultPvcClaimSize)
 	workspacePvcStorageClassName := cr.Spec.Storage.WorkspacePVCStorageClassName
-	pvcJobsImage := util.GetValue(cr.Spec.Storage.PvcJobsImage, DefaultPvcJobsImage)
+	
+	defaultPVCJobsImage := DefaultPvcJobsUpstreamImage
+	if cheFlavor == "codeready" {
+		defaultPVCJobsImage = DefaultPvcJobsImage
+	}
+	pvcJobsImage := util.GetValue(cr.Spec.Storage.PvcJobsImage, defaultPVCJobsImage)
 	preCreateSubPaths := "true"
 	if !cr.Spec.Storage.PreCreateSubPaths {
 		preCreateSubPaths = "false"
diff --git a/pkg/deploy/defaults.go b/pkg/deploy/defaults.go
index 6bdb74e1f..526e01159 100644
--- a/pkg/deploy/defaults.go
+++ b/pkg/deploy/defaults.go
@@ -32,6 +32,7 @@ const (
 	DefaultCheLogLevel               = "INFO"
 	DefaultCheDebug                  = "false"
 	DefaultPvcJobsImage              = "registry.redhat.io/ubi8-minimal:8.0-127"
+	DefaultPvcJobsUpstreamImage      = "registry.access.redhat.com/ubi8-minimal:8.0-127"
 	DefaultPostgresImage             = "registry.redhat.io/rhscl/postgresql-96-rhel7:1-40"
 	DefaultPostgresUpstreamImage     = "centos/postgresql-96-centos7:9.6"
 	DefaultKeycloakImage             = "registry.redhat.io/redhat-sso-7/sso73-openshift:1.0-11"