diff --git a/nitro-bridge-setup/run-nitro-bridge.yml b/nitro-bridge-setup/run-nitro-bridge.yml
index 0d3f2a5..7fbe1d1 100644
--- a/nitro-bridge-setup/run-nitro-bridge.yml
+++ b/nitro-bridge-setup/run-nitro-bridge.yml
@@ -30,14 +30,6 @@
       timeout: 300
       ignore_errors: yes
 
-    - name: Clone repositories required for nitro-stack
-      expect:
-        command: laconic-so --stack {{ ansible_env.HOME }}/cerc/nitro-stack/stack-orchestrator/stacks/bridge setup-repositories --git-ssh --pull
-        responses:
-          "Are you sure you want to continue connecting \\(yes/no/\\[fingerprint\\]\\)\\?": "yes"
-      timeout: 300
-      ignore_errors: yes
-
     - name: Build containers
       command: laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge build-containers --force-rebuild
       when: not skip_container_build
diff --git a/nitro-contracts-setup/deploy-contracts.yml b/nitro-contracts-setup/deploy-contracts.yml
index e68caaa..c46bd6a 100644
--- a/nitro-contracts-setup/deploy-contracts.yml
+++ b/nitro-contracts-setup/deploy-contracts.yml
@@ -14,7 +14,6 @@
         path: "{{ nitro_directory }}"
         state: directory
 
-
     - name: Change owner of nitro-directory
       file:
         path: "{{ nitro_directory }}"
@@ -23,7 +22,7 @@
         state: directory
         recurse: yes
 
-    - name: Clone go-nitro stack repo
+    - name: Clone nitro stack repo
       expect:
         command: laconic-so fetch-stack git.vdb.to/cerc-io/nitro-stack --git-ssh --pull
         responses:
@@ -31,14 +30,6 @@
       timeout: 300
       ignore_errors: yes
 
-    - name: Clone repositories required for nitro-stack
-      expect:
-        command: laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge setup-repositories --git-ssh --pull
-        responses:
-          "Are you sure you want to continue connecting \\(yes/no/\\[fingerprint\\]\\)\\?": "yes"
-      timeout: 300
-      ignore_errors: yes
-
     - name: Build containers
       command: laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge build-containers --force-rebuild
       when: not skip_container_build
diff --git a/nitro-nodes-setup/run-nitro-nodes.yml b/nitro-nodes-setup/run-nitro-nodes.yml
index 648f32e..a191ab3 100644
--- a/nitro-nodes-setup/run-nitro-nodes.yml
+++ b/nitro-nodes-setup/run-nitro-nodes.yml
@@ -37,14 +37,6 @@
       timeout: 300
       ignore_errors: yes
 
-    - name: Clone repositories required for nitro-stack
-      expect:
-        command: laconic-so --stack {{ ansible_env.HOME }}/cerc/nitro-stack/stack-orchestrator/stacks/nitro-node setup-repositories --git-ssh --pull
-        responses:
-          "Are you sure you want to continue connecting \\(yes/no/\\[fingerprint\\]\\)\\?": "yes"
-      timeout: 300
-      ignore_errors: yes
-
     - name: Build containers
       command: laconic-so --stack {{ ansible_env.HOME }}/cerc/nitro-stack/stack-orchestrator/stacks/nitro-node build-containers --force-rebuild
       when: not skip_container_build
diff --git a/service-provider-setup/setup-dns.yml b/service-provider-setup/setup-dns.yml
index 1e7d424..1ad388e 100644
--- a/service-provider-setup/setup-dns.yml
+++ b/service-provider-setup/setup-dns.yml
@@ -91,14 +91,14 @@
         name: "{{ subdomain_prefix }}"
         ttl: 43200
 
-    - name: Create wildcard A record for subdomain
+    - name: Create wildcard CNAME record for subdomain
       community.digitalocean.digital_ocean_domain_record:
         state: present
         oauth_token: "{{ do_api_token }}"
         name: "{{ subdomain_cluster_control }}.{{ full_domain }}"
         data: "{{ service_provider_ip }}"
         domain: "{{ full_domain }}"
-        type: A
+        type: CNAME
         name: "*.{{ subdomain_prefix }}"
         ttl: 43200
 
@@ -112,13 +112,13 @@
         name: "pwa"
         ttl: 43200
 
-    - name: Create wildcard A record for pwa
+    - 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: "{{ service_provider_ip }}"
         domain: "{{ full_domain }}"
-        type: A
+        type: CNAME
         name: "*.pwa"
         ttl: 43200