diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index bc09577f6..f15f00798 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -354,8 +354,9 @@ if hiera('lma::collector::influxdb::server', false) {
 
   class { 'lma_collector::collectd::haproxy':
     socket       => $haproxy_socket,
-    # Ignore internal stats ('Stats' for 6.1, 'stats' for 7.0) and lma proxies
-    proxy_ignore => ['Stats', 'stats', 'lma'],
+    # Ignore internal stats ('Stats' for 6.1, 'stats' for 7.0), lma proxies and
+    # Nova EC2
+    proxy_ignore => ['Stats', 'stats', 'lma', 'nova-api-1'],
     proxy_names  => {
       'ceilometer'          => 'ceilometer-api',
       'cinder-api'          => 'cinder-api',
@@ -371,7 +372,9 @@ if hiera('lma::collector::influxdb::server', false) {
       'murano'              => 'murano-api',
       'mysqld'              => 'mysqld-tcp',
       'neutron'             => 'neutron-api',
-      'nova-api-1'          => 'nova-ec2-api',
+      # starting with Mitaka (and later)
+      'nova-api'            => 'nova-api',
+      # before Mitaka
       'nova-api-2'          => 'nova-api',
       'nova-novncproxy'     => 'nova-novncproxy-websocket',
       'nova-metadata-api'   => 'nova-metadata-api',
diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/gse_filters.yaml.erb b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/gse_filters.yaml.erb
index 297f292d0..d40b79388 100644
--- a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/gse_filters.yaml.erb
+++ b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/gse_filters.yaml.erb
@@ -185,11 +185,6 @@ lma_collector:
           - backends
           - endpoint
           - http_errors
-      nova-ec2-api:
-        policy: highest_severity
-        group_by: member
-        members:
-          - backends
       nova-novncproxy-websocket:
         policy: highest_severity
         group_by: member
@@ -502,7 +497,6 @@ lma_collector:
         members:
           - nova-logs
           - nova-api
-          - nova-ec2-api
           - nova-metadata-api
           - nova-scheduler
           - nova-compute
diff --git a/doc/user/source/metrics/haproxy.rst b/doc/user/source/metrics/haproxy.rst
index ee165f86b..f560aea46 100644
--- a/doc/user/source/metrics/haproxy.rst
+++ b/doc/user/source/metrics/haproxy.rst
@@ -16,7 +16,6 @@
 * murano-api
 * neutron-api
 * nova-api
-* nova-ec2-api
 * nova-metadata-api
 * nova-novncproxy-websocket
 * sahara-api