diff --git a/docs/_releasenotes/1984.fix.1.devel b/docs/_releasenotes/1984.fix.1.devel
new file mode 100644
index 0000000000000000000000000000000000000000..4e52faa1d9976f66ed61b98d5bf09807047597d9
--- /dev/null
+++ b/docs/_releasenotes/1984.fix.1.devel
@@ -0,0 +1 @@
+Cluster setup for IPv6-only clusters has been fixed.
diff --git a/k8s-core/ansible/roles/k8s-master/tasks/main.yaml b/k8s-core/ansible/roles/k8s-master/tasks/main.yaml
index 3d3602fe720f03051af8b2e83784e6cf185f6c29..bba1dc57e6d384e13cf29920c7e87f517dc3e4cd 100644
--- a/k8s-core/ansible/roles/k8s-master/tasks/main.yaml
+++ b/k8s-core/ansible/roles/k8s-master/tasks/main.yaml
@@ -199,7 +199,7 @@
       - name: Generate super admin kubeconfig
         include_tasks: mkkubeconfig.yaml
         vars:
-          kubeconfig_api_server_url: "https://{{ networking_fixed_ip }}:{{ k8s_apiserver_frontend_port }}"
+          kubeconfig_api_server_url: "https://{% if ipv4_enabled %}{{ networking_fixed_ip }}{% elif ipv6_enabled %}[{{ networking_fixed_ip_v6 }}]{% endif %}:{{ k8s_apiserver_frontend_port }}"
           vault_role_id: "{{ vault_node_role_id }}"
           vault_secret_id: "{{ vault_node_secret_id }}"
           kubeconfig_title: super-admin
diff --git a/k8s-core/ansible/roles/migrations/etcd-metrics-listen-patch/tasks/main.yaml b/k8s-core/ansible/roles/migrations/etcd-metrics-listen-patch/tasks/main.yaml
index 369dfce42d1aac4c71d6b601369b639fca1d217c..85c85af9ab6085b9e63d17f519e6fb637df32fe1 100644
--- a/k8s-core/ansible/roles/migrations/etcd-metrics-listen-patch/tasks/main.yaml
+++ b/k8s-core/ansible/roles/migrations/etcd-metrics-listen-patch/tasks/main.yaml
@@ -109,7 +109,7 @@
         name: k8s-master
         tasks_from: mkkubeconfig.yaml
       vars:
-        kubeconfig_api_server_url: "https://{{ networking_fixed_ip }}:{{ k8s_apiserver_frontend_port }}"
+        kubeconfig_api_server_url: "https://{% if ipv4_enabled %}{{ networking_fixed_ip }}{% elif ipv6_enabled %}[{{ networking_fixed_ip_v6 }}]{% endif %}:{{ k8s_apiserver_frontend_port }}"
         vault_role_id: "{{ vault_node_role_id }}"
         vault_secret_id: "{{ vault_node_secret_id }}"
         kubeconfig_title: super-admin