diff --git a/service-provider-setup/setup-dns.yml b/service-provider-setup/setup-dns.yml
index bf306cd..03f92b5 100644
--- a/service-provider-setup/setup-dns.yml
+++ b/service-provider-setup/setup-dns.yml
@@ -95,30 +95,28 @@
       community.digitalocean.digital_ocean_domain_record:
         state: present
         oauth_token: "{{ do_api_token }}"
-        name: "{{ subdomain_cluster_control }}.{{ full_domain }}"
-        data: "{{ subdomain_cluster_control }}.{{ full_domain }}"
+        name: "*.{{ subdomain_prefix }}"
+        data: "{{ subdomain_prefix }}-cluster-control.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "*.{{ subdomain_prefix }}"
         ttl: 43200
 
     - name: Create CNAME record for pwa
       community.digitalocean.digital_ocean_domain_record:
         state: present
         oauth_token: "{{ do_api_token }}"
-        data: "{{ subdomain_cluster_control }}.{{ full_domain }}"
+        name: "pwa"
+        data: "{{ subdomain_prefix }}-cluster-control.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "pwa"
         ttl: 43200
 
     - name: Create wildcard CNAME record for pwa
       community.digitalocean.digital_ocean_domain_record:
         state: present
         oauth_token: "{{ do_api_token }}"
-        name: "{{ subdomain_cluster_control }}.{{ full_domain }}"
-        data: "{{ subdomain_cluster_control }}.{{ full_domain }}"
+        name: "*.pwa"
+        data: "{{ subdomain_prefix }}-cluster-control.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "*.pwa"
-        ttl: 43200
+        ttl: 43200
\ No newline at end of file