diff --git a/roles/ipa-build-tinyipa-image/tasks/main.yaml b/roles/ipa-build-tinyipa-image/tasks/main.yaml
index ae96f15..1c827b1 100644
--- a/roles/ipa-build-tinyipa-image/tasks/main.yaml
+++ b/roles/ipa-build-tinyipa-image/tasks/main.yaml
@@ -13,7 +13,6 @@
   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: |
diff --git a/zuul.d/ironic-python-agent-builder-jobs.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml
index 8fb10b5..f833be2 100644
--- a/zuul.d/ironic-python-agent-builder-jobs.yaml
+++ b/zuul.d/ironic-python-agent-builder-jobs.yaml
@@ -124,18 +124,3 @@
       image_type: 'dib'
       image_distro: 'ubuntu'
       image_release: 'focal'
-
-- job:
-    name: ironic-python-agent-build-image-tinyipa-ussuri
-    parent: ironic-python-agent-build-image-tinyipa
-    nodeset: ubuntu-bionic
-    required-projects:
-      - name: openstack/ironic-python-agent-builder
-        override-checkout: 2.2.0
-- job:
-    name: ironic-python-agent-check-image-tinyipa-ussuri
-    parent: ironic-python-agent-check-image-tinyipa
-    nodeset: ubuntu-bionic
-    required-projects:
-        - name: openstack/ironic-python-agent-builder
-          override-checkout: 2.2.0