diff --git a/template/2026.6.6.1502/ansible/cmn/update_firedancer.yml b/template/2026.6.6.1502/ansible/cmn/update_firedancer.yml
index 77010754..45d66045 100644
--- a/template/2026.6.6.1502/ansible/cmn/update_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/cmn/update_firedancer.yml
@@ -12,7 +12,7 @@
         dest: /home/solv/firedancer
         update: yes
         force: yes
-        version: v{{ mainnet_validators.version_firedancer }}
+        version: "v{{ vars[group_names | difference(['all', 'ungrouped']) | first].version_firedancer | default(mainnet_validators.version_firedancer) }}"
 
     - name: Initialize git submodules
       command: git submodule update --init --recursive
@@ -51,6 +51,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/devnet-rpc/install_jito.yml b/template/2026.6.6.1502/ansible/devnet-rpc/install_jito.yml
index 896e023a..caeacdca 100644
--- a/template/2026.6.6.1502/ansible/devnet-rpc/install_jito.yml
+++ b/template/2026.6.6.1502/ansible/devnet-rpc/install_jito.yml
@@ -61,6 +61,15 @@
         version: '{{ jito_version_resolved }}'
         force: yes
 
+    - name: Remove stale cargo-build-sbf/cargo-test-sbf (avoid cargo-install conflict)
+      become: no
+      file:
+        path: '{{ jito_install_dir }}/bin/{{ item }}'
+        state: absent
+      loop:
+        - cargo-build-sbf
+        - cargo-test-sbf
+
     - name: Build Jito Solana (cargo-install-all)
       become: no
       shell: |
diff --git a/template/2026.6.6.1502/ansible/devnet-rpc/setup_firedancer.yml b/template/2026.6.6.1502/ansible/devnet-rpc/setup_firedancer.yml
index 02b349b6..4713e4ef 100644
--- a/template/2026.6.6.1502/ansible/devnet-rpc/setup_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/devnet-rpc/setup_firedancer.yml
@@ -53,6 +53,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/mainnet-rpc/install_jito.yml b/template/2026.6.6.1502/ansible/mainnet-rpc/install_jito.yml
index 9b22902a..4bf8adfe 100644
--- a/template/2026.6.6.1502/ansible/mainnet-rpc/install_jito.yml
+++ b/template/2026.6.6.1502/ansible/mainnet-rpc/install_jito.yml
@@ -61,6 +61,15 @@
         version: '{{ jito_version_resolved }}'
         force: yes
 
+    - name: Remove stale cargo-build-sbf/cargo-test-sbf (avoid cargo-install conflict)
+      become: no
+      file:
+        path: '{{ jito_install_dir }}/bin/{{ item }}'
+        state: absent
+      loop:
+        - cargo-build-sbf
+        - cargo-test-sbf
+
     - name: Build Jito Solana (cargo-install-all)
       become: no
       shell: |
diff --git a/template/2026.6.6.1502/ansible/mainnet-rpc/setup_firedancer.yml b/template/2026.6.6.1502/ansible/mainnet-rpc/setup_firedancer.yml
index 1b28ae39..6bf8ac39 100644
--- a/template/2026.6.6.1502/ansible/mainnet-rpc/setup_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/mainnet-rpc/setup_firedancer.yml
@@ -14,7 +14,7 @@
         dest: /home/solv/firedancer
         update: yes
         force: yes
-        version: v{{ mainnet_validators.version_firedancer }}
+        version: v{{ mainnet_rpcs.version_firedancer }}
 
     - name: Initialize git submodules
       command: git submodule update --init --recursive
@@ -53,6 +53,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/mainnet-validator/install_jito.yml b/template/2026.6.6.1502/ansible/mainnet-validator/install_jito.yml
index f7a41853..268be99a 100644
--- a/template/2026.6.6.1502/ansible/mainnet-validator/install_jito.yml
+++ b/template/2026.6.6.1502/ansible/mainnet-validator/install_jito.yml
@@ -52,6 +52,15 @@
         version: '{{ jito_version }}'
         force: yes
 
+    - name: Remove stale cargo-build-sbf/cargo-test-sbf (avoid cargo-install conflict)
+      become: no
+      file:
+        path: '{{ jito_install_dir }}/bin/{{ item }}'
+        state: absent
+      loop:
+        - cargo-build-sbf
+        - cargo-test-sbf
+
     - name: Build Jito Solana (cargo-install-all)
       become: no
       shell: |
diff --git a/template/2026.6.6.1502/ansible/mainnet-validator/setup_firedancer.yml b/template/2026.6.6.1502/ansible/mainnet-validator/setup_firedancer.yml
index 150d703a..228a7c12 100644
--- a/template/2026.6.6.1502/ansible/mainnet-validator/setup_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/mainnet-validator/setup_firedancer.yml
@@ -58,6 +58,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/mainnet-validator/update_firedancer.yml b/template/2026.6.6.1502/ansible/mainnet-validator/update_firedancer.yml
index 77010754..5d339bee 100644
--- a/template/2026.6.6.1502/ansible/mainnet-validator/update_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/mainnet-validator/update_firedancer.yml
@@ -51,6 +51,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/testnet-rpc/install_jito.yml b/template/2026.6.6.1502/ansible/testnet-rpc/install_jito.yml
index 7d24ee09..f18297c3 100644
--- a/template/2026.6.6.1502/ansible/testnet-rpc/install_jito.yml
+++ b/template/2026.6.6.1502/ansible/testnet-rpc/install_jito.yml
@@ -61,6 +61,15 @@
         version: '{{ jito_version_resolved }}'
         force: yes
 
+    - name: Remove stale cargo-build-sbf/cargo-test-sbf (avoid cargo-install conflict)
+      become: no
+      file:
+        path: '{{ jito_install_dir }}/bin/{{ item }}'
+        state: absent
+      loop:
+        - cargo-build-sbf
+        - cargo-test-sbf
+
     - name: Build Jito Solana (cargo-install-all)
       become: no
       shell: |
diff --git a/template/2026.6.6.1502/ansible/testnet-rpc/setup_firedancer.yml b/template/2026.6.6.1502/ansible/testnet-rpc/setup_firedancer.yml
index c0ee2f74..e86cc521 100644
--- a/template/2026.6.6.1502/ansible/testnet-rpc/setup_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/testnet-rpc/setup_firedancer.yml
@@ -53,6 +53,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/testnet-rpc/update_firedancer.yml b/template/2026.6.6.1502/ansible/testnet-rpc/update_firedancer.yml
index 77010754..a1bc4381 100644
--- a/template/2026.6.6.1502/ansible/testnet-rpc/update_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/testnet-rpc/update_firedancer.yml
@@ -12,7 +12,7 @@
         dest: /home/solv/firedancer
         update: yes
         force: yes
-        version: v{{ mainnet_validators.version_firedancer }}
+        version: v{{ testnet_rpcs.version_firedancer }}
 
     - name: Initialize git submodules
       command: git submodule update --init --recursive
@@ -51,6 +51,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/testnet-validator/install_jito.yml b/template/2026.6.6.1502/ansible/testnet-validator/install_jito.yml
index fb2d8d0f..cc055c64 100644
--- a/template/2026.6.6.1502/ansible/testnet-validator/install_jito.yml
+++ b/template/2026.6.6.1502/ansible/testnet-validator/install_jito.yml
@@ -52,6 +52,15 @@
         version: '{{ jito_version }}'
         force: yes
 
+    - name: Remove stale cargo-build-sbf/cargo-test-sbf (avoid cargo-install conflict)
+      become: no
+      file:
+        path: '{{ jito_install_dir }}/bin/{{ item }}'
+        state: absent
+      loop:
+        - cargo-build-sbf
+        - cargo-test-sbf
+
     - name: Build Jito Solana (cargo-install-all)
       become: no
       shell: |
diff --git a/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_agave.yml b/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_agave.yml
index 82ba967d..5a172e29 100644
--- a/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_agave.yml
+++ b/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_agave.yml
@@ -56,6 +56,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_jito.yml b/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_jito.yml
index fd273a80..90dd23fe 100644
--- a/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_jito.yml
+++ b/template/2026.6.6.1502/ansible/testnet-validator/setup_firedancer_jito.yml
@@ -56,6 +56,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/ansible/testnet-validator/update_firedancer.yml b/template/2026.6.6.1502/ansible/testnet-validator/update_firedancer.yml
index 77010754..e55fb7fc 100644
--- a/template/2026.6.6.1502/ansible/testnet-validator/update_firedancer.yml
+++ b/template/2026.6.6.1502/ansible/testnet-validator/update_firedancer.yml
@@ -12,7 +12,7 @@
         dest: /home/solv/firedancer
         update: yes
         force: yes
-        version: v{{ mainnet_validators.version_firedancer }}
+        version: v{{ testnet_validators.version_firedancer }}
 
     - name: Initialize git submodules
       command: git submodule update --init --recursive
@@ -51,6 +51,7 @@
         src: /home/solv/firedancer/build/native/gcc/bin/fdctl
         dest: /usr/local/bin/fdctl
         state: link
+        force: yes
       become: yes
       become_user: root
 
diff --git a/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2 b/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
index b8eb7273..e02691e2 100644
--- a/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
+++ b/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
@@ -50,9 +50,11 @@ exec agave-validator \
 --rpc-send-transaction-also-leader \
 {% endif %}
 {% endif %}
---no-port-check{% if rpc_type == 'Geyser gRPC' or rpc_type == 'Index RPC + gRPC' %} \
+--no-port-check \
+{% if rpc_type == 'Geyser gRPC' or rpc_type == 'Index RPC + gRPC' %}
 --rpc-pubsub-enable-block-subscription \
 --rpc-pubsub-enable-vote-subscription \
-{% endif %}{% if validator_type == 'jito' %}
---shred-receiver-address {{ shred_receiver_address | default("64.130.35.224:1002") }}
+{% endif %}
+{% if validator_type == 'jito' %}
+--shred-receiver-address {{ shred_receiver_address | default("64.130.35.224:1002") }} \
 {% endif %}
\ No newline at end of file