diff --git a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
index 93619fe6148..b65be29501d 100644
--- a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
+++ b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/smartcontractkit/chainlink/v2/dashboard/dashboard"
+	"github.com/smartcontractkit/chainlink/charts/chainlink-cluster/dashboard/dashboard"
 	"github.com/smartcontractkit/wasp"
 )
 
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index f62b87edf69..186e49257a1 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -2,6 +2,7 @@ version: v2beta1
 name: chainlink
 
 vars:
+  NS_TTL: 72h
   DEVSPACE_IMAGE:
     source: env
 
@@ -20,7 +21,16 @@ pipelines:
       run_dependencies --all                            # 1. Deploy any projects this project needs (see "dependencies")
       ensure_pull_secrets --all                         # 2. Ensure pull secrets
       build_images --all -t $(git rev-parse --short HEAD)    # 3. Build, tag (git commit hash) and push all images (see "images")
-      create_deployments --all                          # 4. Deploy Helm charts and manifests specfied as "deployments"
+      create_deployments --all                          # 5. Deploy Helm charts and manifests specfied as "deployments"
+      kubectl annotate namespace ${DEVSPACE_NAMESPACE} janitor/ttl=${NS_TTL}
+      echo "Namespace ${DEVSPACE_NAMESPACE} will be deleted in ${NS_TTL}"
+  purge:
+    run: |-
+      kubectl delete ns ${DEVSPACE_NAMESPACE}
+
+commands:
+  connect: |-
+    sudo kubefwd svc -n ${DEVSPACE_NAMESPACE}
 
 images:
   app:
@@ -28,9 +38,21 @@ images:
     dockerfile: ../../core/chainlink.devspace.Dockerfile
     context: ../..
 
+hooks:
+  - wait:
+      running: true
+      terminatedWithCode: 0
+    container:
+      labelSelector:
+        # vars don't work here, = releaseName
+        release: "app"
+    events: ["after:deploy:app"]
+    name: "wait-for-pod-hook"
+
 # This is a list of `deployments` that DevSpace can create for this project
 deployments:
   app:
+    namespace: ${DEVSPACE_NAMESPACE}
     helm:
       releaseName: "app"
       chart:
diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
index 951fb1d2e3c..34ee35887b1 100644
--- a/charts/chainlink-cluster/go.mod
+++ b/charts/chainlink-cluster/go.mod
@@ -1,4 +1,4 @@
-module github.com/smartcontractkit/chainlink/v2/dashboard
+module github.com/smartcontractkit/chainlink/charts/chainlink-cluster/dashboard
 
 go 1.21
 
diff --git a/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml b/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
index 2cd9c3df2b6..05852642a29 100644
--- a/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   namespaceSelector:
     matchNames:
-      - "cl-cluster"
+      - {{ $.Release.Namespace }}
   podMetricsEndpoints:
     - port: access
   selector: