diff --git a/.devfile.yaml b/.devfile.yaml
index 6a61cc1..52f7b5f 100644
--- a/.devfile.yaml
+++ b/.devfile.yaml
@@ -8,18 +8,24 @@ components:
       memoryRequest: 256M
       memoryLimit: 1536M
       cpuRequest: 100m
-      cpuLimit: 500m
+      cpuLimit: 1500m
 commands:
   - id: 1-deploy-devspaces
     exec:
       label: "1. Deploy nightly build of Dev Spaces"
       component: tooling-container
-      commandLine: | 
+      commandLine: |
         [[ "$(oc whoami)" =~ ^kube:admin$ ]] || (echo "You need to login as kubeadmin" && false) &&
-        git submodule init && git submodule update && \
-        git -C devspaces checkout devspaces-3-rhel-8 && \
-        cd devspaces/product && \
-        ./installDevSpacesFromLatestIIB.sh --next
+        DSC_VERSION="3.5.0-CI"; DSC_ARCH="linux-x64"
+        DSC_HOME=${HOME}/.dsc; mkdir -p "${DSC_HOME}"
+        DSC_TGZ_URL="https://github.com/redhat-developer/devspaces-chectl/releases/download/${DSC_VERSION}-dsc-assets/devspaces-${DSC_VERSION%-*}-dsc-${DSC_ARCH}.tar.gz"
+        curl -sSkLo- "${DSC_TGZ_URL}" | tar -zx -C "${DSC_HOME}/" --strip-components 1 
+        if [[ -d ${DSC_HOME}/bin ]]; then \
+          export PATH=${PATH%":${DSC_HOME}/bin"}:${DSC_HOME}/bin; echo -n "Installed: "; dsc version; \
+        else \
+          echo "An error occurred installing dsc $DSC_VERSION for arch $DSC_ARCH ! Check if ${DSC_TGZ_URL} is a valid file."; \
+        fi
+        dsc server:deploy --olm-channel=next --telemetry=off
   - id: 2-day1-configs
     exec:
       label: "2. Create users, change inactivity timeout and enable container build capabilities, GitHub OAuth and image puller"
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 2a2dfdf..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "devspaces"]
-	path = devspaces
-	url = https://github.com/redhat-developer/devspaces
diff --git a/README.md b/README.md
index 9aa5e3a..3385858 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,22 @@ Pre-requisites: `oc`, `jq` and `git` should be pre-installed and you should be l
 
 ```bash
 # STEP 1: Install Dev Spaces next
-git submodule init && git submodule update && git -C devspaces checkout devspaces-3-rhel-8 &&
-cd devspaces/product && ./installDevSpacesFromLatestIIB.sh --next && \
-oc patch OperatorHub cluster --type json -p '[{"op": "add", "path": "/spec/disableAllDefaultSources", "value": false}]' # re-enable default catalog sources
+DSC_VERSION="3.5.0-CI"; DSC_ARCH="linux-x64"
+DSC_HOME=${HOME}/.dsc; mkdir -p "${DSC_HOME}"
+DSC_TGZ_URL="https://github.com/redhat-developer/devspaces-chectl/releases/download/${DSC_VERSION}-dsc-assets/devspaces-${DSC_VERSION%-*}-dsc-${DSC_ARCH}.tar.gz"
+curl -sSkLo- "${DSC_TGZ_URL}" | tar -zx -C "${DSC_HOME}/" --strip-components 1 
+if [[ -d ${DSC_HOME}/bin ]]; then \
+  export PATH=${PATH%":${DSC_HOME}/bin"}:${DSC_HOME}/bin; echo -n "Installed: "; dsc version; \
+else \
+  echo "An error occurred installing dsc $DSC_VERSION for arch $DSC_ARCH ! Check if ${DSC_TGZ_URL} is a valid file."; \
+fi
+
+dsc server:deploy --olm-channel=next
 ```
 
 | :ship: NOTE                                                                                        |
 |-------------------------------------------------------------------------------------------------------|
-| If you want to install the **latest** stable release-in-progress (instead of the **next** CI build), you can use `./installDevSpacesFromLatestIIB.sh --latest`.|
+| If you want to install the **latest** stable release-in-progress (instead of the **next** CI build), you can use `dsc server:deploy --olm-channel=latest'.|
 
 ```bash
 # STEP 2: Day one configurations
diff --git a/devspaces b/devspaces
deleted file mode 160000
index b191c12..0000000
--- a/devspaces
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b191c1253b7d633c0c0d9df3e83bb6c98d993992