diff --git a/Dockerfile b/Dockerfile
index 981346b7ae..79fb8db4e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # NOTE: using registry.redhat.io/rhel8/go-toolset requires login, which complicates automation
 # NOTE: since updateBaseImages.sh does not support other registries than RHCC, update to RHEL8
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/devtools/go-toolset-rhel7
-ARG DEV_WORKSPACE_CONTROLLER_VERSION="master"
+ARG DEV_WORKSPACE_CONTROLLER_VERSION="main"
 ARG DEV_WORKSPACE_CHE_OPERATOR_VERSION="main"
 
 FROM registry.access.redhat.com/devtools/go-toolset-rhel7:1.13.15-4  as builder
diff --git a/local-debug.sh b/local-debug.sh
index 4372d5a789..b57a5e0411 100755
--- a/local-debug.sh
+++ b/local-debug.sh
@@ -18,7 +18,7 @@ command -v operator-sdk >/dev/null 2>&1 || { echo "operator-sdk is not installed
 ECLIPSE_CHE_NAMESPACE="eclipse-che"
 ECLIPSE_CHE_CR="./deploy/crds/org_v1_che_cr.yaml"
 ECLIPSE_CHE_CRD="./deploy/crds/org_v1_che_crd.yaml"
-DEV_WORKSPACE_CONTROLLER_VERSION="master"
+DEV_WORKSPACE_CONTROLLER_VERSION="main"
 DEV_WORKSPACE_CHE_OPERATOR_VERSION="main"
 
 # Stop execution on any error