diff --git a/docs/_releasenotes/1482.feature.2.etcd-metrics-add-ipv6-supprt b/docs/_releasenotes/1482.feature.2.etcd-metrics-add-ipv6-supprt
new file mode 100644
index 0000000000000000000000000000000000000000..56638b74e646a8f2d6ee5a36cbc1f64871ca30d0
--- /dev/null
+++ b/docs/_releasenotes/1482.feature.2.etcd-metrics-add-ipv6-supprt
@@ -0,0 +1 @@
+Add IPv6 support for etcd-metrics-exporter
diff --git a/k8s-supplements/ansible/roles/etcd-metrics-proxy/tasks/main.yaml b/k8s-supplements/ansible/roles/etcd-metrics-proxy/tasks/main.yaml
index 6afcec0f0baa57d0f2e29d2bf555529ea0a537e4..4e37aa05d286b4b9bba7bae7f6bd8d3fd3d7a54e 100644
--- a/k8s-supplements/ansible/roles/etcd-metrics-proxy/tasks/main.yaml
+++ b/k8s-supplements/ansible/roles/etcd-metrics-proxy/tasks/main.yaml
@@ -177,7 +177,7 @@
   kubernetes.core.k8s:
     state: present
     apply: true
-    definition: "{{ lookup('template', 'proxy.yaml') }}"
+    definition: "{{ lookup('template', 'proxy.yaml.j2') }}"
     validate:
       fail_on_error: true
       strict: true
diff --git a/k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml b/k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml.j2
similarity index 93%
rename from k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml
rename to k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml.j2
index 701abd832b836d601c0518bb6145408c74c2155c..3466144bb0489f552c25040119a46a3ede1d8f4f 100644
--- a/k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml
+++ b/k8s-supplements/ansible/roles/etcd-metrics-proxy/templates/proxy.yaml.j2
@@ -27,7 +27,7 @@ spec:
           image: "alpine/socat"
           args:
             - openssl-listen:12381,fork,reuseaddr,cert=/certs/server.crt,key=/certs/server.key,cafile=/certs/client.crt
-            - TCP4:127.0.0.1:2381
+            - "TCP:{% if ipv6_enabled %}[::1]{% elif ipv4_enabled %}127.0.0.1{% endif %}:2381"
           imagePullPolicy: "IfNotPresent"
           ports: []
           volumeMounts: