diff --git a/roles/ipa-build-tinyipa-image/tasks/main.yaml b/roles/ipa-build-tinyipa-image/tasks/main.yaml
index 4e1aaa4..ae96f15 100644
--- a/roles/ipa-build-tinyipa-image/tasks/main.yaml
+++ b/roles/ipa-build-tinyipa-image/tasks/main.yaml
@@ -1,11 +1,20 @@
 - name: Build a TinyIPA image
-  command: make all
+  command: make
   args:
     chdir: '{{ tinyipa_dir }}'
   environment:
     BRANCH_PATH: '{{ ipa_branch_path }}'
     IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
 
+- name: Build a TinyIPA iso
+  command: make iso
+  args:
+    chdir: '{{ tinyipa_dir }}'
+  environment:
+    BRANCH_PATH: '{{ ipa_branch_path }}'
+    IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
+  when: "'ussuri' not in ipa_branch_path"
+
 - name: Move resulting files
   shell: |
     mv tinyipa*.tar.gz* "{{ ipa_tar_dir }}"