diff --git a/Makefile b/Makefile
index 9287b4f68c..350c3b33bc 100644
--- a/Makefile
+++ b/Makefile
@@ -202,14 +202,17 @@ deploy-grafana:
 	@echo "\n$(YELLOW)Local cluster $(CYAN)$(CLUSTER_GSLB1)$(NC)"
 	@echo "\n$(YELLOW)install grafana $(NC)"
 	@$(eval PREVIOUS_CONTEXT := $(shell kubectl config current-context))
-	kubectl config use-context k3d-$(CLUSTER_GSLB1)
-	kubectl apply -f deploy/grafana/dashboard-cm.yaml
-	@kubectl config use-context $(PREVIOUS_CONTEXT)
 	helm repo add grafana https://grafana.github.io/helm-charts
 	helm repo update
 	helm -n k8gb upgrade -i grafana grafana/grafana -f deploy/grafana/values.yaml \
 		--wait --timeout=2m0s \
 		--kube-context=k3d-$(CLUSTER_GSLB1)
+	kubectl config use-context k3d-$(CLUSTER_GSLB1)
+	kubectl apply -f deploy/grafana/dashboard-cm.yaml -n k8gb
+	@kubectl config use-context $(PREVIOUS_CONTEXT)
+	@echo "\nGrafana is listening on http://localhost:3000\n"
+	@echo "🖖 credentials are admin:admin\n"
+
 
 .PHONY: uninstall-grafana
 uninstall-grafana:
diff --git a/deploy/grafana/values.yaml b/deploy/grafana/values.yaml
index b58e57323a..d5373e388b 100644
--- a/deploy/grafana/values.yaml
+++ b/deploy/grafana/values.yaml
@@ -1,3 +1,10 @@
+adminUser: admin
+adminPassword: admin # don't use in production (1st login to web ui will ask for the password change)
+service:
+  nodePort: 30030 # allowed port range between 30000 and 32768
+  targetPort: 3000
+  port: 3000
+  type: NodePort
 sidecar:
   dashboards:
     enabled: true
diff --git a/k3d/test-gslb1.yaml b/k3d/test-gslb1.yaml
index fe5e60ea4e..56e3640e38 100644
--- a/k3d/test-gslb1.yaml
+++ b/k3d/test-gslb1.yaml
@@ -11,6 +11,9 @@ ports:
 - port: 443:443
   nodeFilters:
   - agent[0]
+- port: 3000:30030
+  nodeFilters:
+    - agent[0]
 - port: 8080:30090
   nodeFilters:
     - agent[0]