diff --git a/roles/0-init/tasks/iiab_ini.yml b/roles/0-init/tasks/iiab_ini.yml
index 9230c603c..b5c3b29d3 100644
--- a/roles/0-init/tasks/iiab_ini.yml
+++ b/roles/0-init/tasks/iiab_ini.yml
@@ -35,7 +35,7 @@
       value: "{{ ansible_local.local_facts.iiab_commit }}"
     - option: install_date
       value: "{{ ansible_date_time.iso8601 }}"
-    - option: install_xo
+    - option: xo_model
       value: "{{ xo_model }}"
-    - option: is_rpi
+    - option: rpi_model
       value: "{{ rpi_model }}"
diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index 427377084..6e546a6f8 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -209,7 +209,7 @@
       value: "{{ gw_active }}"
     - option: internet_available
       value: "{{ internet_available }}"
-    - option: is_rpi
+    - option: rpi_model
       value: "{{ rpi_model }}"
     - option: first_run
       value: "{{ first_run }}"