diff --git a/build/scripts/sync-che-olm-to-crw-olm.sh b/build/scripts/sync-che-olm-to-crw-olm.sh
index 0c22f4d4..fd583542 100755
--- a/build/scripts/sync-che-olm-to-crw-olm.sh
+++ b/build/scripts/sync-che-olm-to-crw-olm.sh
@@ -215,6 +215,7 @@ for CSVFILE in ${TARGETDIR}/manifests/codeready-workspaces.csv.yaml; do
 		-e 's|"devfileRegistryImage":.".+"|"devfileRegistryImage": ""|' \
 		-e 's|"pluginRegistryImage":.".+"|"pluginRegistryImage": ""|' \
 		-e 's|"identityProviderImage":.".+"|"identityProviderImage": ""|' \
+		-e 's|"workspaceNamespaceDefault":.".*"|"workspaceNamespaceDefault": "<username>-codeready"|' \
 		\
 		-e "s|quay.io/eclipse/codeready-operator:${CHE_VERSION}|registry.redhat.io/codeready-workspaces/crw-2-rhel8-operator:${CRW_VERSION}|" \
 		-e "s|quay.io/eclipse/che-server:.+|registry.redhat.io/codeready-workspaces/server-rhel8:${CRW_VERSION}|" \
diff --git a/build/scripts/sync-che-operator-to-crw-operator.sh b/build/scripts/sync-che-operator-to-crw-operator.sh
index a476a34a..5c25a06c 100755
--- a/build/scripts/sync-che-operator-to-crw-operator.sh
+++ b/build/scripts/sync-che-operator-to-crw-operator.sh
@@ -184,6 +184,7 @@ yq -y --arg updateName "${updateName}" --arg updateVal "${operator_insertions[$u
 		changed="$(cat "${TARGETDIR}/${d}" | \
 yq  -y '.spec.server.devfileRegistryImage=""|.spec.server.pluginRegistryImage=""' | \
 yq  -y '.spec.server.cheFlavor="codeready"' | \
+yq  -y '.spec.server.workspaceNamespaceDefault="<username>-codeready"' | \
 yq  -y '.spec.storage.pvcStrategy="per-workspace"' | \
 yq  -y '.spec.auth.identityProviderAdminUserName="admin"|.spec.auth.identityProviderImage=""' | \
 yq  -y 'del(.spec.k8s)')" && \