diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 2b60d2435..8e40f0ca6 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -188,10 +188,10 @@ docker-single-down:
 	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml down -v
 
 docker-single-vm-datasource-up:
-	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose-with-datasource.yml up -d
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose.yml up -d
 
 docker-single-vm-datasource-down:
-	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose-with-datasource.yml down -v
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose.yml down -v
 
 docker-cluster-up:
 	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml up -d
@@ -200,7 +200,7 @@ docker-cluster-down:
 	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml down -v
 
 docker-cluster-vm-datasource-up:
-	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml up -d
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster.yml up -d
 
 docker-cluster-vm-datasource-down:
-	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml down -v
+	$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster.yml down -v
diff --git a/deployment/docker/README.md b/deployment/docker/README.md
index fe368e880..6815c1b0e 100644
--- a/deployment/docker/README.md
+++ b/deployment/docker/README.md
@@ -27,6 +27,16 @@ To shut down the docker compose environment for cluster version run the followin
 make docker-cluster-down
 ```
 
+Optionally, environment with [VictoriaMetrics Grafana datasource](https://github.com/VictoriaMetrics/grafana-datasource)
+can be started with the following commands:
+```
+make docker-single-vm-datasource-up    # start single server
+make docker-single-vm-datasource-down  # start cluster
+
+make docker-cluster-vm-datasource-up   # shut down single server
+make docker-cluster-vm-datasource-down # shutdown cluster
+```
+
 ## VictoriaMetrics single server
 
 VictoriaMetrics will be accessible on the following ports:
diff --git a/deployment/docker/vm-datasource/config/victoriametrics-datasource.yml b/deployment/docker/provisioning/datasources/victoriametrics-datasource/victoriametrics-datasource.yml
similarity index 100%
rename from deployment/docker/vm-datasource/config/victoriametrics-datasource.yml
rename to deployment/docker/provisioning/datasources/victoriametrics-datasource/victoriametrics-datasource.yml
diff --git a/deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml b/deployment/docker/vm-datasource/docker-compose-cluster.yml
similarity index 76%
rename from deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml
rename to deployment/docker/vm-datasource/docker-compose-cluster.yml
index 2da5a8ae2..6af1ee293 100644
--- a/deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml
+++ b/deployment/docker/vm-datasource/docker-compose-cluster.yml
@@ -8,16 +8,16 @@ services:
     ports:
       - 3000:3000
     entrypoint: ["/bin/bash", "-c"]
-    command: ["chmod +x /download-vm-datasource.sh && /download-vm-datasource.sh && /run.sh"]
+    command: ["chmod +x /download.sh && /download.sh && /run.sh"]
     volumes:
       - grafanadata:/var/lib/grafana
-      - ./vm-datasource/config:/etc/grafana/provisioning/datasources
+      - ./provisioning/datasources/victoriametrics-datasource:/etc/grafana/provisioning/datasources
       - ./provisioning/dashboards:/etc/grafana/provisioning/dashboards
       - ./provisioning/plugins/:/var/lib/grafana/plugins
       - ./../../dashboards/vm/victoriametrics-cluster.json:/var/lib/grafana/dashboards/vm.json
       - ./../../dashboards/vm/vmagent.json:/var/lib/grafana/dashboards/vmagent.json
       - ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json
-      - ./vm-datasource/scripts/download-vm-datasource.sh:/download-vm-datasource.sh
+      - ./vm-datasource/download.sh:/download.sh
     environment:
       - "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource"
       - "GF_DEFAULT_APP_MODE=development"
diff --git a/deployment/docker/vm-datasource/docker-compose-with-datasource.yml b/deployment/docker/vm-datasource/docker-compose.yml
similarity index 76%
rename from deployment/docker/vm-datasource/docker-compose-with-datasource.yml
rename to deployment/docker/vm-datasource/docker-compose.yml
index 4822803b2..17ce635a6 100644
--- a/deployment/docker/vm-datasource/docker-compose-with-datasource.yml
+++ b/deployment/docker/vm-datasource/docker-compose.yml
@@ -8,16 +8,16 @@ services:
     ports:
       - 3000:3000
     entrypoint: [ "/bin/bash", "-c" ]
-    command: [ "chmod +x /download-vm-datasource.sh && /download-vm-datasource.sh && /run.sh" ]
+    command: [ "chmod +x /download.sh && /download.sh && /run.sh" ]
     volumes:
       - grafanadata:/var/lib/grafana
-      - ./vm-datasource/config:/etc/grafana/provisioning/datasources
+      - ./provisioning/datasources/victoriametrics-datasource:/etc/grafana/provisioning/datasources
       - ./provisioning/dashboards:/etc/grafana/provisioning/dashboards
       - ./provisioning/plugins/:/var/lib/grafana/plugins
       - ./../../dashboards/vm/victoriametrics.json:/var/lib/grafana/dashboards/vm.json
       - ./../../dashboards/vm/vmagent.json:/var/lib/grafana/dashboards/vmagent.json
       - ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json
-      - ./vm-datasource/scripts/download-vm-datasource.sh:/download-vm-datasource.sh
+      - ./vm-datasource/download.sh:/download.sh
     environment:
       - "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource"
       - "GF_DEFAULT_APP_MODE=development"
diff --git a/deployment/docker/vm-datasource/scripts/download-vm-datasource.sh b/deployment/docker/vm-datasource/download.sh
similarity index 100%
rename from deployment/docker/vm-datasource/scripts/download-vm-datasource.sh
rename to deployment/docker/vm-datasource/download.sh