diff --git a/roles/perfmon_install/tasks/install_local_pkg.yml b/roles/perfmon_install/tasks/install_local_pkg.yml
index ba944101..23558220 100644
--- a/roles/perfmon_install/tasks/install_local_pkg.yml
+++ b/roles/perfmon_install/tasks/install_local_pkg.yml
@@ -111,58 +111,20 @@
     package_arch: 'sles'
   when: ansible_distribution in scale_sles_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Rhel
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel7/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Sles
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel8/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel9/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu16/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-    - scale_version >= "5.1.4.0"
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles12/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: 'zimon_rpms/sles15/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 #
 # Find Zimon collector
diff --git a/roles/perfmon_install/tasks/install_remote_pkg.yml b/roles/perfmon_install/tasks/install_remote_pkg.yml
index b1881d17..d2846aaa 100644
--- a/roles/perfmon_install/tasks/install_remote_pkg.yml
+++ b/roles/perfmon_install/tasks/install_remote_pkg.yml
@@ -85,58 +85,20 @@
     package_arch: 'sles'
   when: ansible_distribution in scale_sles_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Rhel
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel7/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Sles
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel8/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel9/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu16/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-    - scale_version >= "5.1.4.0"
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles12/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: 'zimon_rpms/sles15/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 #
 # Find Zimon collector
diff --git a/roles/perfmon_install/tasks/install_repository.yml b/roles/perfmon_install/tasks/install_repository.yml
index 5538d131..aeec8dbe 100644
--- a/roles/perfmon_install/tasks/install_repository.yml
+++ b/roles/perfmon_install/tasks/install_repository.yml
@@ -9,69 +9,20 @@
    scale_zimon_url: ""
    scale_zimon_collector_url: ""
 
-- name: install | zimon path
+- name: install | zimon path on Rhel
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel7/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Sles
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel8/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: install | zimon path
+- name: install | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel9/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel10/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '10'
-    
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu16/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
-  when: 
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-    - scale_version >= "5.1.4.0"
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
-  when: 
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles12/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles15/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 - name: install | remove existing zimon APT repository
   file:
diff --git a/roles/perfmon_upgrade/tasks/install_local_pkg.yml b/roles/perfmon_upgrade/tasks/install_local_pkg.yml
index 6ac06856..44aa1190 100644
--- a/roles/perfmon_upgrade/tasks/install_local_pkg.yml
+++ b/roles/perfmon_upgrade/tasks/install_local_pkg.yml
@@ -111,64 +111,21 @@
     package_arch: 'sles'
   when: ansible_distribution in scale_sles_distribution
 
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel7/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel8/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel9/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu16/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Rhel
   set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: install | zimon path
+- name: upgrade | zimon path on Sles
   set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
-  when: 
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-    - scale_version >= "5.1.4.0"
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
-  when: 
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/'
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles12/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: 'zimon_rpms/sles15/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 #
 # Find Zimon collector
diff --git a/roles/perfmon_upgrade/tasks/install_remote_pkg.yml b/roles/perfmon_upgrade/tasks/install_remote_pkg.yml
index 7149617a..df14afad 100644
--- a/roles/perfmon_upgrade/tasks/install_remote_pkg.yml
+++ b/roles/perfmon_upgrade/tasks/install_remote_pkg.yml
@@ -85,40 +85,20 @@
     package_arch: 'sles'
   when: ansible_distribution in scale_sles_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Rhel
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel7/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Sles
   set_fact:
-    scale_zimon_url: 'zimon_rpms/rhel8/'
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu16/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_debs/ubuntu/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: 'zimon_rpms/sles12/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: 'zimon_rpms/sles15/'
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 #
 # Find Zimon collector
diff --git a/roles/perfmon_upgrade/tasks/install_repository.yml b/roles/perfmon_upgrade/tasks/install_repository.yml
index e710956e..8e72cdcb 100644
--- a/roles/perfmon_upgrade/tasks/install_repository.yml
+++ b/roles/perfmon_upgrade/tasks/install_repository.yml
@@ -11,69 +11,21 @@
     is_scale_collector_pkg_installed: false
     is_scale_pmswift_pkg_installed: false
 
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_rpms/rhel7/"
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_rpms/rhel8/"
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_rpms/rhel9/"
-  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/ubuntu16/"
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '16'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/ubuntu18/"
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
-
-- name: upgrade | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/"
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
 
-- name: install | zimon path
+- name: upgrade | zimon path on Rhel
   set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/"
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/ubuntu20/"
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
-    - scale_version >= "5.1.4.0"
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/ubuntu22/"
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
-
-- name: install | zimon path
-  set_fact:
-    scale_zimon_url: "zimon_debs/ubuntu/ubuntu24/"
-  when:
-    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24'
+    scale_zimon_url: 'zimon_rpms/rhel{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_rhel_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Sles
   set_fact:
-    scale_zimon_url: "zimon_rpms/sles12/"
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '12'
+    scale_zimon_url: 'zimon_rpms/sles{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_sles_distribution
 
-- name: upgrade | zimon path
+- name: upgrade | zimon path on Ubuntu
   set_fact:
-    scale_zimon_url: "zimon_rpms/sles15/"
-  when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu{{ ansible_distribution_major_version }}/'
+  when: ansible_distribution in scale_ubuntu_distribution
 
 - name: install | remove existing zimon APT repository
   file: