diff --git a/service-provider-setup/setup-dns.yml b/service-provider-setup/setup-dns.yml
index 3830dd5..38eb412 100644
--- a/service-provider-setup/setup-dns.yml
+++ b/service-provider-setup/setup-dns.yml
@@ -58,7 +58,7 @@
         data: "{{ subdomain_cluster_control }}.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "{{ subdomain_prefix }}.{{ full_domain }}"
+        name: "{{ subdomain_prefix }}"
         ttl: 43200
 
     - name: Create CNAME record for laconicd endpoint
@@ -68,7 +68,7 @@
         data: "{{ org_id }}-daemon.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "laconicd.{{ full_domain }}"
+        name: "laconicd"
         ttl: 43200
 
     - name: Create CNAME record for backend
@@ -78,7 +78,7 @@
         data: "{{ org_id }}-daemon.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "{{ org_id }}-backend.{{ full_domain }}"
+        name: "{{ org_id }}-backend"
         ttl: 43200
 
     - name: Create CNAME record for console
@@ -88,17 +88,7 @@
         data: "{{ org_id }}-daemon.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        name: "{{ org_id }}-console.{{ full_domain }}"
-        ttl: 43200
-
-    - name: Create CNAME record for org and location
-      community.digitalocean.digital_ocean_domain_record:
-        state: present
-        oauth_token: "{{ do_api_token }}"
-        data: "{{ org_id }}-daemon.{{ full_domain }}"
-        domain: "{{ full_domain }}"
-        type: CNAME
-        name: "{{ subdomain_prefix }}"
+        name: "{{ org_id }}-console"
         ttl: 43200
 
     - name: Create wildcard CNAME record for subdomain