diff --git a/metricbeat/docs/modules/haproxy.asciidoc b/metricbeat/docs/modules/haproxy.asciidoc
index 8ba4995f8a68..bbdd4db93668 100644
--- a/metricbeat/docs/modules/haproxy.asciidoc
+++ b/metricbeat/docs/modules/haproxy.asciidoc
@@ -38,6 +38,8 @@ required authentication add this to the haproxy config:
    stats auth admin:admin
 ----
 
+The default metricsets are `info`and `stat`.
+
 [float]
 === Compatibility
 
@@ -54,8 +56,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: haproxy
-  metricsets: ["info", "stat"]
-  period: 10s
   hosts: ["tcp://127.0.0.1:14567"]
 ----
 
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index 26afe45ce62e..34dd6c61494a 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -230,6 +230,7 @@ metricbeat.modules:
   metricsets: ["info", "stat"]
   period: 10s
   hosts: ["tcp://127.0.0.1:14567"]
+  enabled: true
 
 #-------------------------------- HTTP Module --------------------------------
 - module: http
diff --git a/metricbeat/module/haproxy/_meta/config.reference.yml b/metricbeat/module/haproxy/_meta/config.reference.yml
new file mode 100644
index 000000000000..bf45b4dc75ae
--- /dev/null
+++ b/metricbeat/module/haproxy/_meta/config.reference.yml
@@ -0,0 +1,5 @@
+- module: haproxy
+  metricsets: ["info", "stat"]
+  period: 10s
+  hosts: ["tcp://127.0.0.1:14567"]
+  enabled: true
diff --git a/metricbeat/module/haproxy/_meta/config.yml b/metricbeat/module/haproxy/_meta/config.yml
index febce8d22468..203e1cc772f7 100644
--- a/metricbeat/module/haproxy/_meta/config.yml
+++ b/metricbeat/module/haproxy/_meta/config.yml
@@ -1,4 +1,2 @@
 - module: haproxy
-  metricsets: ["info", "stat"]
-  period: 10s
   hosts: ["tcp://127.0.0.1:14567"]
diff --git a/metricbeat/module/haproxy/_meta/docs.asciidoc b/metricbeat/module/haproxy/_meta/docs.asciidoc
index cb88103f47aa..9c2dfa3da0c3 100644
--- a/metricbeat/module/haproxy/_meta/docs.asciidoc
+++ b/metricbeat/module/haproxy/_meta/docs.asciidoc
@@ -31,6 +31,8 @@ required authentication add this to the haproxy config:
    stats auth admin:admin
 ----
 
+The default metricsets are `info`and `stat`.
+
 [float]
 === Compatibility
 
diff --git a/metricbeat/module/haproxy/info/info.go b/metricbeat/module/haproxy/info/info.go
index e5243d8fd3a2..02b301072d22 100644
--- a/metricbeat/module/haproxy/info/info.go
+++ b/metricbeat/module/haproxy/info/info.go
@@ -19,9 +19,10 @@ var (
 
 // init registers the haproxy info MetricSet.
 func init() {
-	if err := mb.Registry.AddMetricSet("haproxy", "info", New, haproxy.HostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("haproxy", "info", New,
+		mb.WithHostParser(haproxy.HostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for haproxy info.
diff --git a/metricbeat/module/haproxy/stat/stat.go b/metricbeat/module/haproxy/stat/stat.go
index d7fd1443ff1b..8b74cac27eb8 100644
--- a/metricbeat/module/haproxy/stat/stat.go
+++ b/metricbeat/module/haproxy/stat/stat.go
@@ -19,9 +19,10 @@ var (
 
 // init registers the haproxy stat MetricSet.
 func init() {
-	if err := mb.Registry.AddMetricSet("haproxy", statsMethod, New, haproxy.HostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("haproxy", statsMethod, New,
+		mb.WithHostParser(haproxy.HostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for haproxy stats.
diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled
index febce8d22468..203e1cc772f7 100644
--- a/metricbeat/modules.d/haproxy.yml.disabled
+++ b/metricbeat/modules.d/haproxy.yml.disabled
@@ -1,4 +1,2 @@
 - module: haproxy
-  metricsets: ["info", "stat"]
-  period: 10s
   hosts: ["tcp://127.0.0.1:14567"]