diff --git a/.gitignore b/.gitignore
index accc24d84cd..11df66360d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ fig.yml
 docker-compose.yml
 docker-compose.yaml
 /conf/provisioning/**/custom.yaml
+/conf/provisioning/**/dev.yaml
 /conf/ldap_dev.toml
 profile.cov
 /grafana
diff --git a/devenv/dashboards/bulk-testing/bulk-dashboards.yaml b/devenv/bulk-dashboards/bulk-dashboards.yaml
similarity index 100%
rename from devenv/dashboards/bulk-testing/bulk-dashboards.yaml
rename to devenv/bulk-dashboards/bulk-dashboards.yaml
diff --git a/devenv/dashboards/bulk-testing/bulkdash.jsonnet b/devenv/bulk-dashboards/bulkdash.jsonnet
similarity index 100%
rename from devenv/dashboards/bulk-testing/bulkdash.jsonnet
rename to devenv/bulk-dashboards/bulkdash.jsonnet
diff --git a/devenv/dashboards.yaml b/devenv/dashboards.yaml
new file mode 100644
index 00000000000..226c1a8b335
--- /dev/null
+++ b/devenv/dashboards.yaml
@@ -0,0 +1,9 @@
+apiVersion: 1
+
+providers:
+ - name: 'gdev dashboards'
+   folder: 'gdev dashboards'
+   type: file
+   options:
+     path: devenv/dev-dashboards
+
diff --git a/devenv/dashboards/dev-dashboards/dev-dashboards.yaml b/devenv/dashboards/dev-dashboards/dev-dashboards.yaml
deleted file mode 100644
index 343910de738..00000000000
--- a/devenv/dashboards/dev-dashboards/dev-dashboards.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'dev dashboards'
-   folder: 'dev dashboards'
-   type: file
-   options:
-     path: devenv/dashboards/dev-dashboards
-
diff --git a/devenv/datasources/default/default.yaml b/devenv/datasources.yaml
similarity index 81%
rename from devenv/datasources/default/default.yaml
rename to devenv/datasources.yaml
index dc2310f15aa..e93c0217f27 100644
--- a/devenv/datasources/default/default.yaml
+++ b/devenv/datasources.yaml
@@ -1,38 +1,38 @@
 apiVersion: 1
 
 datasources:
-  - name: Graphite
+  - name: gdev-graphite
     type: graphite
     access: proxy
     url: http://localhost:8080
     jsonData:
       graphiteVersion: "1.1"
-  
-  - name: Prometheus
+
+  - name: gdev-prometheus
     type: prometheus
     access: proxy
     isDefault: true
     url: http://localhost:9090
-  
-  - name: InfluxDB
+
+  - name: gdev-influxdb
     type: influxdb
     access: proxy
     database: site
     user: grafana
     password: grafana
     url: http://localhost:8086
-    jsonData: 
+    jsonData:
       timeInterval: "15s"
 
-  - name: OpenTsdb
+  - name: gdev-opentsdb
     type: opentsdb
     access: proxy
     url: http://localhost:4242
-    jsonData: 
+    jsonData:
       tsdbResolution: 1
       tsdbVersion: 1
 
-  - name: Elastic
+  - name: gdev-elasticsearch-metrics
     type: elasticsearch
     access: proxy
     database: "[metrics-]YYYY.MM.DD"
@@ -40,22 +40,22 @@ datasources:
     jsonData:
       interval: Daily
       timeField: "@timestamp"
-  
-  - name: MySQL
+
+  - name: gdev-mysql
     type: mysql
     url: localhost:3306
     database: grafana
     user: grafana
     password: password
 
-  - name: MSSQL
+  - name: gdev-mssql
     type: mssql
     url: localhost:1433
     database: grafana
     user: grafana
     password: "Password!"
 
-  - name: Postgres
+  - name: gdev-postgres
     type: postgres
     url: localhost:5432
     database: grafana
@@ -64,7 +64,7 @@ datasources:
     jsonData:
       sslmode: "disable"
 
-  - name: Cloudwatch
+  - name: gdev-cloudwatch
     type: cloudwatch
     editable: true
     jsonData:
diff --git a/devenv/dashboards/dev-dashboards/dashboard_with_rows.json b/devenv/dev-dashboards/dashboard_with_rows.json
similarity index 100%
rename from devenv/dashboards/dev-dashboards/dashboard_with_rows.json
rename to devenv/dev-dashboards/dashboard_with_rows.json
diff --git a/devenv/setup.sh b/devenv/setup.sh
index 0900b57e583..78dbfc1a366 100755
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -23,41 +23,36 @@ requiresJsonnet() {
 }
 
 defaultDashboards() {
-		requiresJsonnet
-
-		ln -s -f -r ./dashboards/dev-dashboards/dev-dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
+		ln -s -f ../../../devenv/dashboards.yaml ../conf/provisioning/dashboards/dev.yaml
 }
 
 defaultDatasources() {
 		echo "setting up all default datasources using provisioning"
 
-		ln -s -f -r ./datasources/default/default.yaml ../conf/provisioning/datasources/custom.yaml
+		ln -s -f ../../../devenv/datasources.yaml ../conf/provisioning/datasources/dev.yaml
 }
 
 usage() {
-	echo -e "install.sh\n\tThis script installs my basic setup for a debian laptop\n"
+	echo -e "install.sh\n\tThis script setups dev provision for datasources and dashboards"
 	echo "Usage:"
 	echo "  bulk-dashboards                     - create and provisioning 400 dashboards"
-	echo "  default-datasources                 - provisiong all core datasources"
+	echo "  no args                             - provisiong core datasources and dev dashboards"
 }
 
 main() {
 	local cmd=$1
 
-	if [[ -z "$cmd" ]]; then
-		usage
-		exit 1
-	fi
-
 	if [[ $cmd == "bulk-dashboards" ]]; then
 		bulkDashboard
-	elif [[ $cmd == "default-datasources" ]]; then
-		defaultDatasources
-	elif [[ $cmd == "default-dashboards" ]]; then
-		defaultDashboards
 	else
+		defaultDashboards
+		defaultDatasources
+	fi
+
+  if [[ -z "$cmd" ]]; then
 		usage
 	fi
+
 }
 
 main "$@"