diff --git a/roles/remoteit/defaults/main.yml b/roles/remoteit/defaults/main.yml
index 48a7f0304..5acf6b379 100644
--- a/roles/remoteit/defaults/main.yml
+++ b/roles/remoteit/defaults/main.yml
@@ -7,7 +7,7 @@
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
 
-# # 2022-03-31: https://remote.it/download/ offers 4 relevant "Device Packages"
+# # 2022-03-31: https://remote.it/download/ offered 4 relevant "Device Packages"
 # # 1) Raspberry Pi (ARM)    = armhf.rpi
 # # 2) Raspberry Pi (ARM64)  = arm64.rpi
 # # 3) Debian Linux (ARM64)  = arm64
@@ -32,23 +32,26 @@
 # # # Example...         https://downloads.remote.it/remoteit/v4.14.1/remoteit-4.14.1.armhf.rpi.deb
 
 
-# 2022-03-31: https://remote.it/download/ offers 4 relevant "CLI" installs:
-# 1) Debian Linux (ARM v6) OR Raspberry Pi (ARM)   = armv6
-# 2) Debian Linux (ARM v7)                         = armv7
-# 3) Debian Linux (ARM64)  OR Raspberry Pi (ARM64) = arm64
+# 2022-10-09: https://remote.it/download/ offers 4 relevant "CLI" installs:
+# 1) Debian Linux (ARM v6) OR Raspberry Pi (ARM)   = armv6 -> arm-v6
+# 2) Debian Linux (ARM v7)                         = armv7 -> arm-v7
+# 3) Debian Linux (ARM64)  OR Raspberry Pi (ARM64) = arm64 -> aarch64
 # 4) Debian Linux (x86_64)                         = x86_64
 
-# See https://docs.remote.it/software/cli/overview to refine URL below:
-cli_suffixes:
-  armv6: armv6
-  armv6l: armv6
-  armv7: armv7
-  armv7l: armv7
-  armv8: arm64
-  aarch64: arm64
+# SEE https://www.remote.it/download-list
+#     https://www.remote.it/download-list?products=cli to refine arch/URL below
+# BUT https://docs.remote.it/software/cli/overview can be useful OR stale :/
+remoteit_arch_dict:
+  armv6: arm-v6
+  armv6l: arm-v6
+  armv7: arm-v7
+  armv7l: arm-v7
+  armv8: aarch64
+  aarch64: aarch64
   x86_64: x86_64
-remoteit_cli_suffix: "{{ cli_suffixes[ansible_architecture] | default('unknown') }}"
-remoteit_cli_url: https://downloads.remote.it/cli/latest/remoteit_linux_{{ remoteit_cli_suffix }}
+remoteit_arch: "{{ remoteit_arch_dict[ansible_machine] | default('unknown') }}"    # A bit safer than ansible_architecture (see kiwix/defaults/main.yml)
+remoteit_cli_url: https://downloads.remote.it/cli/latest/remoteit.{{ remoteit_arch }}-linux
+
 
 # OPTION #1: Run 'sudo iiab-remoteit' after IIAB is installed.