diff --git a/.github/bin/common.sh b/.github/bin/common.sh
index 74101161e..deca39ba8 100755
--- a/.github/bin/common.sh
+++ b/.github/bin/common.sh
@@ -243,7 +243,7 @@ setServerExposureStrategy() {
 
 enableDevWorkspace() {
   local file="${1}/che-operator/crds/org_v1_che_cr.yaml"
-  yq -rSY '.spec.devworkspace.enable = "${2}"' $file > /tmp/tmp.yaml && mv /tmp/tmp.yaml ${file}
+  yq -rSY '.spec.devWorkspace.enable = '${2}'' $file > /tmp/tmp.yaml && mv /tmp/tmp.yaml ${file}
 }
 
 setSingleHostExposureType() {
diff --git a/.github/bin/minikube/test-operator-singlehost-gateway.sh b/.github/bin/minikube/test-operator-singlehost-gateway.sh
index 0b9188b2d..3ad350137 100755
--- a/.github/bin/minikube/test-operator-singlehost-gateway.sh
+++ b/.github/bin/minikube/test-operator-singlehost-gateway.sh
@@ -25,7 +25,7 @@ trap "catchFinish" EXIT SIGINT
 prepareTemplates() {
   disableUpdateAdminPassword ${TEMPLATES}
   setCustomOperatorImage ${TEMPLATES} ${OPERATOR_IMAGE}
-  # Enabling by default devworkspace che operator automatically choose `single-host` strategy
+  setServerExposureStrategy ${TEMPLATES} "single-host"
   enableDevWorkspace ${TEMPLATES} true
   setSingleHostExposureType ${TEMPLATES} "gateway"
   setIngressDomain ${TEMPLATES} "$(minikube ip).nip.io"
diff --git a/.github/bin/minikube/test-operator-singlehost-native.sh b/.github/bin/minikube/test-operator-singlehost-native.sh
index 0586c311f..9dc1ae520 100755
--- a/.github/bin/minikube/test-operator-singlehost-native.sh
+++ b/.github/bin/minikube/test-operator-singlehost-native.sh
@@ -24,7 +24,7 @@ trap "catchFinish" EXIT SIGINT
 prepareTemplates() {
   disableUpdateAdminPassword ${TEMPLATES}
   setCustomOperatorImage ${TEMPLATES} ${OPERATOR_IMAGE}
-  # Enabling by default devworkspace che operator automatically choose `single-host` strategy
+  setServerExposureStrategy ${TEMPLATES} "single-host"
   enableDevWorkspace ${TEMPLATES} true
   setSingleHostExposureType ${TEMPLATES} "native"
   setIngressDomain ${TEMPLATES} "$(minikube ip).nip.io"