diff --git a/devenv/README.md b/devenv/README.md
index 650c35a198d..dea908032c8 100644
--- a/devenv/README.md
+++ b/devenv/README.md
@@ -26,11 +26,10 @@ found. The dashboards are located in the `devenv/dev-dashboards` folder.
 
 This command creates a docker-compose file with specified databases configured and ready to run. Each database has
 a prepared image with some fake data ready to use. For available databases, see `docker/blocks` directory. Notice that
-for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
-version.
+for some databases there are multiple images with different versions. Some blocks such as `slow_proxy_mac` or `apache_proxy_mac` are specifically for Macs.  
 
 ```bash
-make devenv sources=influxdb,prometheus2,elastic5
+make devenv sources=influxdb,prometheus,elastic5
 ```
 
 Some of the blocks support dynamic change of the image version used in the Docker file. The signature looks like this: 
diff --git a/devenv/docker/blocks/prometheus/Dockerfile b/devenv/docker/blocks/prometheus/Dockerfile
index 2098e6527d3..ea9fc071e3c 100644
--- a/devenv/docker/blocks/prometheus/Dockerfile
+++ b/devenv/docker/blocks/prometheus/Dockerfile
@@ -1,3 +1,4 @@
-FROM prom/prometheus:v1.8.2
+FROM prom/prometheus:latest
 ADD prometheus.yml /etc/prometheus/
-ADD alert.rules /etc/prometheus/
+ADD recording.yml /etc/prometheus/
+ADD alert.yml /etc/prometheus/
diff --git a/devenv/docker/blocks/prometheus/alert.rules b/devenv/docker/blocks/prometheus/alert.rules
deleted file mode 100644
index 563d1e89994..00000000000
--- a/devenv/docker/blocks/prometheus/alert.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# Alert Rules
-
-ALERT AppCrash
-  IF process_open_fds > 0
-  FOR 15s
-  LABELS { severity="critical" }
-  ANNOTATIONS {
-   summary = "Number of open fds > 0",
-   description = "Just testing"
-  }
diff --git a/devenv/docker/blocks/prometheus2/alert.yml b/devenv/docker/blocks/prometheus/alert.yml
similarity index 100%
rename from devenv/docker/blocks/prometheus2/alert.yml
rename to devenv/docker/blocks/prometheus/alert.yml
diff --git a/devenv/docker/blocks/prometheus/docker-compose.yaml b/devenv/docker/blocks/prometheus/docker-compose.yaml
index 40e9912f7c4..342bb5d90c2 100644
--- a/devenv/docker/blocks/prometheus/docker-compose.yaml
+++ b/devenv/docker/blocks/prometheus/docker-compose.yaml
@@ -2,6 +2,8 @@
     build: docker/blocks/prometheus
     ports:
       - "9090:9090"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   node_exporter:
     image: prom/node-exporter
diff --git a/devenv/docker/blocks/prometheus/prometheus.yml b/devenv/docker/blocks/prometheus/prometheus.yml
index 6783ff5e2d9..5fe6e9ac988 100644
--- a/devenv/docker/blocks/prometheus/prometheus.yml
+++ b/devenv/docker/blocks/prometheus/prometheus.yml
@@ -6,9 +6,9 @@ global:
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
 rule_files:
-  - "alert.rules"
-  # - "first.rules"
-  # - "second.rules"
+  - "alert.yml"
+  - "recording.yml"
+# - "second.rules"
 
 alerting:
   alertmanagers:
@@ -32,7 +32,7 @@ scrape_configs:
 
   - job_name: 'grafana'
     static_configs:
-      - targets: ['localhost:3000']
+      - targets: ['host.docker.internal:3000']
 
   - job_name: 'prometheus-random-data'
     static_configs:
diff --git a/devenv/docker/blocks/prometheus2/recording.yml b/devenv/docker/blocks/prometheus/recording.yml
similarity index 100%
rename from devenv/docker/blocks/prometheus2/recording.yml
rename to devenv/docker/blocks/prometheus/recording.yml
diff --git a/devenv/docker/blocks/prometheus2/Dockerfile b/devenv/docker/blocks/prometheus2/Dockerfile
deleted file mode 100644
index ea9fc071e3c..00000000000
--- a/devenv/docker/blocks/prometheus2/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM prom/prometheus:latest
-ADD prometheus.yml /etc/prometheus/
-ADD recording.yml /etc/prometheus/
-ADD alert.yml /etc/prometheus/
diff --git a/devenv/docker/blocks/prometheus2/docker-compose.yaml b/devenv/docker/blocks/prometheus2/docker-compose.yaml
deleted file mode 100644
index 0b1834a8e00..00000000000
--- a/devenv/docker/blocks/prometheus2/docker-compose.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-  prometheus:
-    build: docker/blocks/prometheus2
-    ports:
-      - "9090:9090"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  node_exporter:
-    image: prom/node-exporter
-    ports:
-      - "9100:9100"
-
-  fake-prometheus-data:
-    image: grafana/fake-data-gen
-    ports:
-      - "9091:9091"
-    environment:
-      FD_DATASOURCE: prom
-
-  alertmanager:
-    image: quay.io/prometheus/alertmanager
-    ports:
-      - "9093:9093"
-
-  prometheus-random-data:
-    build: docker/blocks/prometheus_random_data
-    ports:
-      - "8081:8080"
diff --git a/devenv/docker/blocks/prometheus2/prometheus.yml b/devenv/docker/blocks/prometheus2/prometheus.yml
deleted file mode 100644
index 5fe6e9ac988..00000000000
--- a/devenv/docker/blocks/prometheus2/prometheus.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# my global config
-global:
-  scrape_interval:     10s # By default, scrape targets every 15 seconds.
-  evaluation_interval: 10s # By default, scrape targets every 15 seconds.
-  # scrape_timeout is set to the global default (10s).
-
-# Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-  - "alert.yml"
-  - "recording.yml"
-# - "second.rules"
-
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - "alertmanager:9093"
-
-scrape_configs:
-  - job_name: 'prometheus'
-    static_configs:
-      - targets: ['localhost:9090']
-
-  - job_name: 'node_exporter'
-    static_configs:
-      - targets: ['node_exporter:9100']
-
-  - job_name: 'fake-data-gen'
-    static_configs:
-      - targets: ['fake-prometheus-data:9091']
-
-  - job_name: 'grafana'
-    static_configs:
-      - targets: ['host.docker.internal:3000']
-
-  - job_name: 'prometheus-random-data'
-    static_configs:
-      - targets: ['prometheus-random-data:8080']