diff --git a/devspaces/NOTES.md b/devspaces/NOTES.md
deleted file mode 100644
index 11a1c830..00000000
--- a/devspaces/NOTES.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# General Notes
-
-## Key images
-
-Init containers
-
-```
-# che / vscode image
-registry.redhat.io/devspaces/code-rhel8
-# init container copies bins to `/checode`
-
-# project clone
-registry.redhat.io/devworkspace/devworkspace-project-clone-rhel8
-```
-
-Other containers
-
-```
-# che gateway
-registry.redhat.io/devspaces/traefik-rhel8
-
-# developer tools
-https://github.com/devfile/developer-images
-
-# che docs
-https://eclipse.dev/che/docs/stable/overview/introduction-to-eclipse-che/
-https://github.com/eclipse/che
-```
-
-Dashboard / devfile registry
-
-```
-https://github.com/eclipse-che/che-devfile-registry
-```
diff --git a/devspaces/aggregate/overlays/default/kustomization.yaml b/devspaces/aggregate/overlays/default/kustomization.yaml
index 713d4b98..1fabfb08 100644
--- a/devspaces/aggregate/overlays/default/kustomization.yaml
+++ b/devspaces/aggregate/overlays/default/kustomization.yaml
@@ -5,5 +5,5 @@ commonAnnotations:
   argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 
 resources:
-  - ../../../instance/overlays/default
+  - ../../../instance/overlays/timeout-12m
   - ../../../operator/overlays/stable
diff --git a/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml b/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml
deleted file mode 100644
index 1fabfb08..00000000
--- a/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonAnnotations:
-  argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-
-resources:
-  - ../../../instance/overlays/timeout-12m
-  - ../../../operator/overlays/stable
diff --git a/devspaces/instance/overlays/low-idle/kustomization.yaml b/devspaces/aggregate/overlays/low-idle/kustomization.yaml
similarity index 77%
rename from devspaces/instance/overlays/low-idle/kustomization.yaml
rename to devspaces/aggregate/overlays/low-idle/kustomization.yaml
index 84a9d4bc..0076e3aa 100644
--- a/devspaces/instance/overlays/low-idle/kustomization.yaml
+++ b/devspaces/aggregate/overlays/low-idle/kustomization.yaml
@@ -1,10 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: devspaces
-
 resources:
-  - ../../base
+  - ../../../instance/overlays/timeout-12m
+  - ../../../operator/overlays/stable
 
 patches:
   - target: