diff --git a/pkg/deploy/kubernetes_image_puller_test.go b/pkg/deploy/kubernetes_image_puller_test.go
index b91794abfb..53330019d1 100644
--- a/pkg/deploy/kubernetes_image_puller_test.go
+++ b/pkg/deploy/kubernetes_image_puller_test.go
@@ -16,17 +16,27 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/eclipse-che/che-operator/pkg/util"
 	"github.com/google/go-cmp/cmp"
 )
 
 func TestEnvVars(t *testing.T) {
-
 	type testcase struct {
 		name     string
 		env      map[string]string
 		expected []ImageAndName
 	}
 
+	// unset RELATED_IMAGE environment variables, set them back
+	// after tests complete
+	matches := util.GetEnvByRegExp("^RELATED_IMAGE_.*")
+	for _, match := range matches {
+		if originalValue, exists := os.LookupEnv(match.Name); exists {
+			os.Unsetenv(match.Name)
+			defer os.Setenv(match.Name, originalValue)
+		}
+	}
+
 	cases := []testcase{
 		{
 			name: "detect plugin broker images",
@@ -53,31 +63,41 @@ func TestEnvVars(t *testing.T) {
 		{
 			name: "detect machine exec image",
 			env: map[string]string{
-				"RELATED_IMAGE_che_machine_exec_plugin_registry_image_IBZWQYJ": "quay.io/eclipse/che-machine-exec",
+				"RELATED_IMAGE_che_machine_exec_plugin_registry_image_IBZWQYJ":                  "quay.io/eclipse/che-machine-exec",
+				"RELATED_IMAGE_codeready_workspaces_machineexec_plugin_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/machineexec-rhel8",
 			},
 			expected: []ImageAndName{
 				{Name: "che_machine_exec_plugin_registry_image_IBZWQYJ", Image: "quay.io/eclipse/che-machine-exec"},
+				{Name: "codeready_workspaces_machineexec_plugin_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/machineexec-rhel8"},
 			},
 		},
 		{
 			name: "detect plugin registry images",
 			env: map[string]string{
-				"RELATED_IMAGE_che_openshift_plugin_registry_image_IBZWQYJ": "index.docker.io/dirigiblelabs/dirigible-openshift",
+				"RELATED_IMAGE_che_openshift_plugin_registry_image_IBZWQYJ":                          "index.docker.io/dirigiblelabs/dirigible-openshift",
+				"RELATED_IMAGE_codeready_workspaces_plugin_openshift_plugin_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/plugin-openshift-rhel8",
 			},
 			expected: []ImageAndName{
 				{Name: "che_openshift_plugin_registry_image_IBZWQYJ", Image: "index.docker.io/dirigiblelabs/dirigible-openshift"},
+				{Name: "codeready_workspaces_plugin_openshift_plugin_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/plugin-openshift-rhel8"},
 			},
 		},
 		{
 			name: "detect devfile registry images",
 			env: map[string]string{
-				"RELATED_IMAGE_che_cpp_rhel7_devfile_registry_image_G4XDGNR":    "quay.io/eclipse/che-cpp-rhel7",
-				"RELATED_IMAGE_che_dotnet_2_2_devfile_registry_image_G4XDGNR":   "quay.io/eclipse/che-dotnet-2.2",
-				"RELATED_IMAGE_che_dotnet_3_1_devfile_registry_image_G4XDGNR":   "quay.io/eclipse/che-dotnet-3.1",
-				"RELATED_IMAGE_che_golang_1_14_devfile_registry_image_G4XDGNR":  "quay.io/eclipse/che-golang-1.14",
-				"RELATED_IMAGE_che_php_7_devfile_registry_image_G4XDGNR":        "quay.io/eclipse/che-php-7",
-				"RELATED_IMAGE_che_java11_maven_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-java11-maven",
-				"RELATED_IMAGE_che_java8_maven_devfile_registry_image_G4XDGNR":  "quay.io/eclipse/che-java8-maven",
+				"RELATED_IMAGE_che_cpp_rhel7_devfile_registry_image_G4XDGNR":                       "quay.io/eclipse/che-cpp-rhel7",
+				"RELATED_IMAGE_che_dotnet_2_2_devfile_registry_image_G4XDGNR":                      "quay.io/eclipse/che-dotnet-2.2",
+				"RELATED_IMAGE_che_dotnet_3_1_devfile_registry_image_G4XDGNR":                      "quay.io/eclipse/che-dotnet-3.1",
+				"RELATED_IMAGE_che_golang_1_14_devfile_registry_image_G4XDGNR":                     "quay.io/eclipse/che-golang-1.14",
+				"RELATED_IMAGE_che_php_7_devfile_registry_image_G4XDGNR":                           "quay.io/eclipse/che-php-7",
+				"RELATED_IMAGE_che_java11_maven_devfile_registry_image_G4XDGNR":                    "quay.io/eclipse/che-java11-maven",
+				"RELATED_IMAGE_che_java8_maven_devfile_registry_image_G4XDGNR":                     "quay.io/eclipse/che-java8-maven",
+				"RELATED_IMAGE_codeready_workspaces_stacks_cpp_devfile_registry_image_GIXDCMQK":    "registry.redhat.io/codeready-workspaces/stacks-cpp-rhel8",
+				"RELATED_IMAGE_codeready_workspaces_stacks_dotnet_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-dotnet-rhel8",
+				"RELATED_IMAGE_codeready_workspaces_stacks_golang_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-golang-rhel8",
+				"RELATED_IMAGE_codeready_workspaces_stacks_php_devfile_registry_image_GIXDCMQK":    "registry.redhat.io/codeready-workspaces/stacks-php-rhel8",
+				"RELATED_IMAGE_codeready_workspaces_plugin_java11_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/plugin-java11-rhel8",
+				"RELATED_IMAGE_codeready_workspaces_plugin_java8_devfile_registry_image_GIXDCMQK":  "registry.redhat.io/codeready-workspaces/plugin-java8-rhel8",
 			},
 			expected: []ImageAndName{
 				{Name: "che_cpp_rhel7_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-cpp-rhel7"},
@@ -87,6 +107,12 @@ func TestEnvVars(t *testing.T) {
 				{Name: "che_php_7_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-php-7"},
 				{Name: "che_java11_maven_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-java11-maven"},
 				{Name: "che_java8_maven_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-java8-maven"},
+				{Name: "codeready_workspaces_stacks_cpp_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-cpp-rhel8"},
+				{Name: "codeready_workspaces_stacks_dotnet_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-dotnet-rhel8"},
+				{Name: "codeready_workspaces_stacks_golang_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-golang-rhel8"},
+				{Name: "codeready_workspaces_stacks_php_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-php-rhel8"},
+				{Name: "codeready_workspaces_plugin_java11_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/plugin-java11-rhel8"},
+				{Name: "codeready_workspaces_plugin_java8_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/plugin-java8-rhel8"},
 			},
 		},
 	}
@@ -95,16 +121,12 @@ func TestEnvVars(t *testing.T) {
 		t.Run(c.name, func(t *testing.T) {
 			for k, v := range c.env {
 				os.Setenv(k, v)
+				defer os.Unsetenv(k)
 			}
-
 			actual := GetDefaultImages()
-
 			if d := cmp.Diff(sortImages(c.expected), sortImages(actual)); d != "" {
 				t.Errorf("Error, collected images differ (-want, +got): %v", d)
 			}
-			for k := range c.env {
-				os.Unsetenv(k)
-			}
 		})
 	}
 }