diff --git a/deps/rabbitmq_prometheus/Makefile b/deps/rabbitmq_prometheus/Makefile
index b3708a3e65..509afe30d7 100644
--- a/deps/rabbitmq_prometheus/Makefile
+++ b/deps/rabbitmq_prometheus/Makefile
@@ -1,6 +1,6 @@
 TODAY := $(shell date -u +'%Y.%m.%d')
 # Use the latest alpha RabbitMQ 3.8 release - https://dl.bintray.com/rabbitmq/all-dev/rabbitmq-server/
-BASED_ON_RABBITMQ_VERSION := 3.8.0-alpha.803
+BASED_ON_RABBITMQ_VERSION := 3.8.0-alpha.806
 DOCKER_IMAGE_NAME := pivotalrabbitmq/rabbitmq-prometheus
 DOCKER_IMAGE_VERSION := $(BASED_ON_RABBITMQ_VERSION)-$(TODAY)
 # RABBITMQ_VERSION is used in rabbitmq-components.mk to set PROJECT_VERSION
diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml b/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
index 9f22c8fed7..c10a34cfc8 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   rmq0-dist-tls: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
-    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
+    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
     networks:
       - "rabbitmq-prometheus"
     ports:
diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
index b35d1fcc10..990d8514d2 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   rmq0: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
-    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
+    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
     networks:
       - "rabbitmq-prometheus"
     ports:
diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-qq.yml b/deps/rabbitmq_prometheus/docker/docker-compose-qq.yml
index 1c6a3cb21f..9b3527510e 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-qq.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-qq.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   rmq0-qq: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
-    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
+    image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
     networks:
       - "rabbitmq-prometheus"
     ports:
diff --git a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl
index 97cebbbfc9..add1f2f965 100644
--- a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl
+++ b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl
@@ -55,7 +55,7 @@
     ]},
 
     {channel_process_metrics, [
-        {2, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
+        {2, channel_process_reductions_total, counter, "Total number of channel process reductions"}
     ]},
 
     {channel_queue_metrics, [
@@ -81,7 +81,7 @@
     {connection_coarse_metrics, [
         {2, connection_incoming_bytes_total, counter, "Total number of bytes received on a connection"},
         {3, connection_outgoing_bytes_total, counter, "Total number of bytes sent on a connection"},
-        {4, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
+        {4, connection_process_reductions_total, counter, "Total number of connection process reductions"}
     ]},
 
     {connection_metrics, [
@@ -153,7 +153,7 @@
         {2, queue_messages_ready, gauge, "Messages ready to be delivered to consumers"},
         {3, queue_messages_unacked, gauge, "Messages delivered to consumers but not yet acknowledged"},
         {4, queue_messages, gauge, "Sum of ready and unacknowledged messages - total queue depth"},
-        {5, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
+        {5, queue_process_reductions_total, counter, "Total number of queue process reductions"}
     ]},
 
     {queue_metrics, [
diff --git a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl
index d84668000f..8dd9cb6b48 100644
--- a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl
+++ b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl
@@ -164,7 +164,7 @@ metrics_test(Config) ->
     %% Checking that we have the first metric from each ETS table owned by rabbitmq_metrics
     ?assertEqual(match, re:run(Body, "rabbitmq_channel_consumers{", [{capture, none}])),
     ?assertEqual(match, re:run(Body, "rabbitmq_channel_messages_published{", [{capture, none}])),
-    ?assertEqual(match, re:run(Body, "rabbitmq_erlang_process_reductions_total{", [{capture, none}])),
+    ?assertEqual(match, re:run(Body, "rabbitmq_channel_process_reductions_total{", [{capture, none}])),
     ?assertEqual(match, re:run(Body, "rabbitmq_channel_get_ack_total{", [{capture, none}])),
     ?assertEqual(match, re:run(Body, "rabbitmq_connection_opened_total{", [{capture, none}])),
     ?assertEqual(match, re:run(Body, "rabbitmq_connection_incoming_bytes_total{", [{capture, none}])),