diff --git a/ansible/roles/public_dns/tasks/create-gandi.yml b/ansible/roles/public_dns/tasks/create-gandi.yml
index d429df55..9e8c78b5 100644
--- a/ansible/roles/public_dns/tasks/create-gandi.yml
+++ b/ansible/roles/public_dns/tasks/create-gandi.yml
@@ -3,7 +3,7 @@
   community.general.gandi_livedns:
     state: present
     domain: "{{ pd_gandi_zone }}"
-    record: "{{ item }}.{{ pd_public_domain }}"
+    record: "{{ item }}.{{ cluster_name }}"
     type: A
     values:
       - "{{ pd_public_ip }}"
@@ -20,7 +20,7 @@
   community.general.gandi_livedns:
     state: present
     domain: "{{ pd_gandi_zone }}"
-    record: "{{ item }}.{{ pd_public_domain }}"
+    record: "{{ item }}.{{ cluster_name }}"
     type: AAAA
     values:
       - "{{ pd_public_ipv6 }}"
diff --git a/ansible/roles/public_dns/tasks/destroy-gandi.yml b/ansible/roles/public_dns/tasks/destroy-gandi.yml
index 0f969fbe..9b1ec968 100644
--- a/ansible/roles/public_dns/tasks/destroy-gandi.yml
+++ b/ansible/roles/public_dns/tasks/destroy-gandi.yml
@@ -3,7 +3,7 @@
   community.general.gandi_livedns:
     state: absent
     domain: "{{ pd_gandi_zone }}"
-    record: "{{ item }}.{{ pd_public_domain }}"
+    record: "{{ item }}.{{ cluster_name }}"
     type: A
     api_key: "{{ gandi_api_key }}"
   with_items:
@@ -17,7 +17,7 @@
   community.general.gandi_livedns:
     state: absent
     domain: "{{ pd_gandi_zone }}"
-    record: "{{ item }}.{{ pd_public_domain }}"
+    record: "{{ item }}.{{ cluster_name }}"
     type: AAAA
     api_key: "{{ gandi_api_key }}"
   with_items: