From 9667f8c2061ebc5275e08677ac18803357e4a5a1 Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Mon, 8 Jun 2026 14:51:38 +0530
Subject: [PATCH 01/16] localrepo checkmarx fixes

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 .../module_utils/local_repo/download_image.py | 12 ++++--
 .../local_repo/process_parallel.py            | 43 +++++++++++--------
 common/library/modules/parallel_tasks.py      |  4 +-
 .../tasks/check_rhel_subscription.yml         | 11 +++++
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/common/library/module_utils/local_repo/download_image.py b/common/library/module_utils/local_repo/download_image.py
index 98a1cb5b66..793999772a 100644
--- a/common/library/module_utils/local_repo/download_image.py
+++ b/common/library/module_utils/local_repo/download_image.py
@@ -19,6 +19,7 @@
 import json
 from multiprocessing import Lock
 from jinja2 import Template
+from ansible.module_utils.local_repo.process_parallel import docker_password_cipher
 from ansible.module_utils.local_repo.standard_logger import setup_standard_logger
 from ansible.module_utils.local_repo.parse_and_download import execute_command,write_status_to_file
 from ansible.module_utils.local_repo.user_image_utility import handle_user_image_registry
@@ -40,7 +41,7 @@
 file_lock = Lock()
 
 def create_container_remote_with_auth(remote_name, remote_url, package, policy_type,
-                                     tag, logger, docker_username, docker_password):
+                                     tag, logger, docker_username, docker_secret_token):
     """
     Create a container remote with authentication.
 
@@ -61,6 +62,9 @@ def create_container_remote_with_auth(remote_name, remote_url, package, policy_t
         bool: True if the container remote was created or updated successfully, False otherwise.
     """
     try:
+        docker_password = docker_password_cipher.decrypt(
+            docker_secret_token.encode("utf-8")
+        ).decode("utf-8")
         remote_exists = execute_command(pulp_container_commands["show_container_remote"] % remote_name, logger)
         if not remote_exists:
             tags_json = json.dumps([tag])  # --> '["1.25.2-alpine"]'
@@ -263,7 +267,7 @@ def get_repo_url_and_content(package):
 #     raise ValueError(f"Unsupported package prefix for package: {package}")
 
 def process_image(package, status_file_path, version_variables,
-                 user_registries,docker_username, docker_password, logger):
+                 user_registries,docker_username, docker_secret_token, logger):
     """
     Process an image.
     Args:
@@ -331,10 +335,10 @@ def process_image(package, status_file_path, version_variables,
             package_identifier += f":{package['tag']}"
 
             with remote_creation_lock:
-                if package['package'].startswith('docker.io/') and docker_username and docker_password:
+                if package['package'].startswith('docker.io/') and docker_username and docker_secret_token:
                     result = create_container_remote_with_auth(
                         remote_name, base_url, package_content, policy_type,
-                        tag_val, logger, docker_username, docker_password
+                        tag_val, logger, docker_username, docker_secret_token
                     )
                 else:
                     result = create_container_remote(
diff --git a/common/library/module_utils/local_repo/process_parallel.py b/common/library/module_utils/local_repo/process_parallel.py
index 63c8560ba2..b6a9cc68c6 100644
--- a/common/library/module_utils/local_repo/process_parallel.py
+++ b/common/library/module_utils/local_repo/process_parallel.py
@@ -23,8 +23,9 @@
 import traceback
 import json
 import yaml
-import json
 import requests
+from pathlib import Path
+from cryptography.fernet import Fernet
 from jinja2 import Template
 from ansible.module_utils.local_repo.common_functions import (
     load_yaml_file,
@@ -39,6 +40,7 @@
 )
 # Global lock for logging synchronization
 log_lock = multiprocessing.Lock()
+docker_password_cipher = Fernet(Fernet.generate_key())
 
 def load_docker_credentials(vault_yml_path, vault_password_file):
     """
@@ -83,18 +85,24 @@ def load_docker_credentials(vault_yml_path, vault_password_file):
             )
             data = yaml.safe_load(result.stdout)
         else:
-            with open(vault_yml_path, "r", encoding="utf-8") as fh:
-                data = yaml.safe_load(fh)
+            data = yaml.safe_load(Path(vault_yml_path).read_text(encoding="utf-8"))
         docker_username = data.get("docker_username")
-        docker_password = data.get("docker_password")
+        docker_secret_token = None
+        if data.get("docker_password"):
+            docker_secret_token = docker_password_cipher.encrypt(
+                data.get("docker_password").encode("utf-8")
+            ).decode("utf-8")
 
         # If either credential is missing, skip validation
-        if not docker_username or not docker_password:
+        if not docker_username or not docker_secret_token:
             return None, None
 
         # Validate credentials using Docker Hub API
         try:
-            payload = json.dumps({"username": docker_username, "password": docker_password})
+            validation_secret = docker_password_cipher.decrypt(
+                docker_secret_token.encode("utf-8")
+            ).decode("utf-8")
+            payload = json.dumps({"username": docker_username, "password": validation_secret})
             response = requests.post(
                 "https://hub.docker.com/v2/users/login/",
                 data=payload,
@@ -106,7 +114,7 @@ def load_docker_credentials(vault_yml_path, vault_password_file):
             )
 
             if response.status_code == 200:
-                return docker_username, docker_password
+                return docker_username, docker_secret_token
 
             if response.status_code == 429:
                 raise RuntimeError("Docker Hub rate limit exceeded. Please try again later.")
@@ -186,7 +194,7 @@ def setup_logger(log_dir,log_file_path):
 
 def execute_task(task, determine_function, user_data, version_variables, arc,
                 repo_store_path, csv_file_path,logger, user_registries,
-                docker_username, docker_password, timeout=None):
+                docker_username, docker_secret_token, timeout=None):
     """
     Executes a task by determining the appropriate function to call, managing execution time, 
     handling timeouts, and logging the results.
@@ -221,7 +229,7 @@ def execute_task(task, determine_function, user_data, version_variables, arc,
 
         # Determine the function and its arguments using the provided `determine_function`
         function, args = determine_function(task, repo_store_path, csv_file_path, user_data,
-                         version_variables, arc, user_registries, docker_username, docker_password)
+                         version_variables, arc, user_registries, docker_username, docker_secret_token)
 
         while True:
             elapsed_time = time.time() - start_time  # Calculate elapsed time
@@ -276,7 +284,7 @@ def execute_task(task, determine_function, user_data, version_variables, arc,
         }
 def worker_process(task, determine_function, user_data, version_variables, arc, repo_store_path,
                   csv_file_path, log_dir, result_queue, user_registries,
-                  docker_username, docker_password, timeout):
+                  omnia_credentials_yaml_path, omnia_credentials_vault_path, timeout):
     """
     Executes a task in a separate worker process, logs the process execution,
     and puts the result in a result queue.
@@ -293,7 +301,8 @@ def worker_process(task, determine_function, user_data, version_variables, arc,
         result_queue (multiprocessing.Queue): Queue for putting the result of the 
         task execution (used for inter-process communication).
         docker_username: Docker username provided by the user
-        docker_password: Docker password for the provided username
+        omnia_credentials_yaml_path: Path to the Omnia credentials YAML file
+        omnia_credentials_vault_path: Path to the Omnia credentials vault password file
         user_registries (str): List of user registries
         timeout (float): The maximum allowed time for the task execution.
     Returns:
@@ -307,10 +316,12 @@ def worker_process(task, determine_function, user_data, version_variables, arc,
         # Log the start of the worker process execution
         with log_lock:
             logger.info(f"Worker process {os.getpid()} started  execution.")
+        docker_username, docker_secret_token = load_docker_credentials(omnia_credentials_yaml_path,
+                                                                      omnia_credentials_vault_path)
         # Execute the task by calling the `execute_task` function and passing necessary arguments
         result = execute_task(task, determine_function, user_data, version_variables, arc,
                              repo_store_path, csv_file_path, logger, user_registries,
-                             docker_username, docker_password, timeout)
+                             docker_username, docker_secret_token, timeout)
         result["logname"] = f"package_status_{os.getpid()}.log"
         # Put the result of the task execution into the result_queue for further processing
         result_queue.put(result)
@@ -389,12 +400,6 @@ def execute_parallel(
     #                 registry["username"] = creds.get("username")
     #                 registry["password"] = creds.get("password")
 
-
-    try:
-        docker_username, docker_password = load_docker_credentials(omnia_credentials_yaml_path,
-                                                                  omnia_credentials_vault_path)
-    except RuntimeError as e:
-        raise
     # Create a pool of worker processes to handle the tasks
     with multiprocessing.Pool(processes=nthreads) as pool:
         task_results = []  # List to hold references to the async results of the tasks
@@ -406,7 +411,7 @@ def execute_parallel(
             task['package'] = package_name
             task_results.append(pool.apply_async(worker_process, (task, determine_function, user_data,
                                version_variables, arc, repo_store_path, csv_file_path, log_dir, result_queue,
-                               user_registries,docker_username, docker_password, timeout)))
+                               user_registries, omnia_credentials_yaml_path, omnia_credentials_vault_path, timeout)))
 
         pool.close()  # Close the pool to new tasks once all have been submitted
         start_time = time.time()  # Start time for overall task execution
diff --git a/common/library/modules/parallel_tasks.py b/common/library/modules/parallel_tasks.py
index 48b5d6b5dc..e696256bed 100644
--- a/common/library/modules/parallel_tasks.py
+++ b/common/library/modules/parallel_tasks.py
@@ -131,7 +131,7 @@ def update_status_csv(csv_dir, software, overall_status,slogger):
 
 def determine_function(
     task, repo_store_path, csv_file_path, user_data, version_variables, arc,
-    user_registries, docker_username, docker_password
+    user_registries, docker_username, docker_secret_token
 ):
     """
     Determines the appropriate function and its arguments to process a given task.
@@ -211,7 +211,7 @@ def determine_function(
         if task_type == "image":
             return process_image, [
                 task, status_file, version_variables, user_registries,
-                docker_username, docker_password
+                docker_username, docker_secret_token
             ]
         if task_type == "rpm_file":
             return process_rpm_file, [
diff --git a/input_validation/roles/validate_subscription/tasks/check_rhel_subscription.yml b/input_validation/roles/validate_subscription/tasks/check_rhel_subscription.yml
index 31007eb059..09ad929f51 100644
--- a/input_validation/roles/validate_subscription/tasks/check_rhel_subscription.yml
+++ b/input_validation/roles/validate_subscription/tasks/check_rhel_subscription.yml
@@ -75,6 +75,17 @@
         state: directory
         mode: "{{ hostvars['localhost']['dir_permissions_755'] }}"
 
+    - name: Remove stale files from rhel_repo_cert_dir before fresh copy
+      ansible.builtin.file:
+        path: "{{ rhel_repo_cert_dir }}"
+        state: absent
+
+    - name: Recreate rhel_repo_cert_dir after cleanup
+      ansible.builtin.file:
+        path: "{{ rhel_repo_cert_dir }}"
+        state: directory
+        mode: "{{ hostvars['localhost']['dir_permissions_755'] }}"
+
     - name: Find entitlement certs on oim
       ansible.builtin.shell: |
         set -o pipefail

From e75de54588d8c46321abfde276bbb41714890ce4 Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Mon, 8 Jun 2026 17:18:28 +0530
Subject: [PATCH 02/16] Checkmarx fixes

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 .../library/module_utils/local_repo/software_utils.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/library/module_utils/local_repo/software_utils.py b/common/library/module_utils/local_repo/software_utils.py
index 2c8a3b3da0..da20edea12 100644
--- a/common/library/module_utils/local_repo/software_utils.py
+++ b/common/library/module_utils/local_repo/software_utils.py
@@ -230,14 +230,14 @@ def is_remote_url_reachable(remote_url, timeout=10,
                     verify=ca_cert,
                     timeout=timeout
                 )
-            except requests.exceptions.SSLError as ssl_exc:
+            except requests.exceptions.SSLError:
                 # Python 3.13+ rejects CA certs with non-critical Basic
                 # Constraints (RFC 5280 strict mode). Retry against the
                 # SAME CA with VERIFY_X509_STRICT cleared — still validates
                 # the full chain and hostname, just relaxes the one check.
                 logger.warning(
-                    f"Strict SSL verification failed for {remote_url}: "
-                    f"{ssl_exc}. Retrying with VERIFY_X509_STRICT cleared.")
+                    f"Strict SSL verification failed for {remote_url}. "
+                    "Retrying with VERIFY_X509_STRICT cleared.")
                 session = requests.Session()
                 adapter = _RelaxedCAAdapter(
                     ca_cert, client_cert, client_key)
@@ -250,10 +250,9 @@ def is_remote_url_reachable(remote_url, timeout=10,
             logger.error(
                 f"URL {remote_url} returned HTTP {response.status_code}")
         return response.status_code == 200
-    except Exception as exc:
+    except Exception:
         logger.error(
-            f"URL reachability exception for {remote_url}: "
-            f"{type(exc).__name__}: {exc}")
+            f"URL reachability check failed for {remote_url}")
         return False
 
 def transform_package_dict(data, arch_val,logger):

From 401b62536d88e130fdbbd328143b5b8fc02f03ca Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Mon, 8 Jun 2026 19:30:06 +0530
Subject: [PATCH 03/16] vast metrics relabeling fix

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 .../victoria-operator-vmscrape.yaml.j2        | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/provision/roles/telemetry/templates/telemetry/victoria/victoria-operator-vmscrape.yaml.j2 b/provision/roles/telemetry/templates/telemetry/victoria/victoria-operator-vmscrape.yaml.j2
index 8de7d1b393..0fa6a2f930 100644
--- a/provision/roles/telemetry/templates/telemetry/victoria/victoria-operator-vmscrape.yaml.j2
+++ b/provision/roles/telemetry/templates/telemetry/victoria/victoria-operator-vmscrape.yaml.j2
@@ -146,18 +146,12 @@ spec:
           name: ufm-telemetry-credentials
           key: password
 {% endif %}
-      relabelings:
-        - action: replace
-          sourceLabels: []
-          targetLabel: source
+      relabelConfigs:
+        - targetLabel: source
           replacement: ufm
-        - action: replace
-          sourceLabels: []
-          targetLabel: subsystem
+        - targetLabel: subsystem
           replacement: infiniband
-        - action: replace
-          sourceLabels: []
-          targetLabel: job
+        - targetLabel: job
           replacement: ufm-infiniband-metrics
 {% endif %}
 
@@ -201,17 +195,13 @@ spec:
           name: vast-telemetry-credentials
           key: password
 {% endif %}
-      relabelings:
-        - action: replace
-          sourceLabels: []
-          targetLabel: source
-          replacement: vast
-        - action: replace
-          sourceLabels: []
-          targetLabel: subsystem
+      relabelConfigs:
+        - targetLabel: source_subsystem
           replacement: vast
-        - action: replace
-          sourceLabels: []
-          targetLabel: job
+        - targetLabel: subsystem
+          replacement: storage
+        - sourceLabels: [__meta_kubernetes_service_label_app]
+          targetLabel: vast_domain
+        - targetLabel: job
           replacement: vast-storage-metrics
 {% endif %}

From 5929bf97676046028eef03106da6b206a9ef74cf Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Tue, 9 Jun 2026 15:04:23 +0530
Subject: [PATCH 04/16] ansible 2.20 fixes

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 local_repo/pulp_cleanup.yml                         | 13 ++++++++++---
 .../pulp/tasks/create_pulp_config_https.yml         |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/local_repo/pulp_cleanup.yml b/local_repo/pulp_cleanup.yml
index 0b2eff9346..04e4fda5ae 100644
--- a/local_repo/pulp_cleanup.yml
+++ b/local_repo/pulp_cleanup.yml
@@ -106,7 +106,8 @@
 
           WARNING: This will permanently delete the specified artifacts.
           This action cannot be undone.
-          Type 'yes' to continue or press Ctrl+C to abort
+          Type 'yes' to continue or 'no' to abort
+        echo: true
       register: user_input
       when: not force_skip_confirmation
 
@@ -114,9 +115,15 @@
       ansible.builtin.set_fact:
         user_confirmed: "{{ (user_input.user_input | default('') | lower) == 'yes' }}"
 
+    - name: Display cancellation message
+      ansible.builtin.debug:
+        msg: "Cleanup cancelled by user. Exiting."
+      when:
+        - not force_skip_confirmation
+        - not user_confirmed
+
     - name: Abort if not confirmed
-      ansible.builtin.fail:
-        msg: "Cleanup cancelled by user"
+      ansible.builtin.meta: end_play
       when:
         - not force_skip_confirmation
         - not user_confirmed
diff --git a/prepare_oim/roles/deploy_containers/pulp/tasks/create_pulp_config_https.yml b/prepare_oim/roles/deploy_containers/pulp/tasks/create_pulp_config_https.yml
index f015f6ce74..a548bf6ed6 100644
--- a/prepare_oim/roles/deploy_containers/pulp/tasks/create_pulp_config_https.yml
+++ b/prepare_oim/roles/deploy_containers/pulp/tasks/create_pulp_config_https.yml
@@ -128,7 +128,7 @@
     - name: Record current timestamp in track file
       ansible.builtin.copy:
         dest: "{{ track_file_path }}"
-        content: "Timestamp: {{ ansible_date_time.iso8601 }}"
+        content: "Timestamp: {{ ansible_facts.date_time.iso8601 }}"
         mode: "{{ logs_dir_permission }}"
 
 # CERT GENERATION USING community.crypto x509_certificate MODULE

From f692da04645e355e5f312508a12f5587d3e4910e Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Thu, 11 Jun 2026 18:28:50 +0530
Subject: [PATCH 05/16] aarch64 image builder update

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 build_stream/core/catalog/test_fixtures/catalog_rhel.json  | 4 ++--
 examples/catalog/catalog_rhel.json                         | 4 ++--
 examples/catalog/catalog_rhel_aarch64_with_slurm_only.json | 4 ++--
 examples/catalog/catalog_rhel_with_nfs_provisioner.json    | 4 ++--
 input/config/aarch64/rhel/10.0/default_packages.json       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build_stream/core/catalog/test_fixtures/catalog_rhel.json b/build_stream/core/catalog/test_fixtures/catalog_rhel.json
index 3b7c2c11a0..5f931163de 100644
--- a/build_stream/core/catalog/test_fixtures/catalog_rhel.json
+++ b/build_stream/core/catalog/test_fixtures/catalog_rhel.json
@@ -4487,8 +4487,8 @@
           "aarch64"
         ],
         "Type": "image",
-        "Tag": "1.1",
-        "Version": "1.1"
+        "Tag": "1.2",
+        "Version": "1.2"
       }
     },
     "Miscellaneous": [],
diff --git a/examples/catalog/catalog_rhel.json b/examples/catalog/catalog_rhel.json
index 6da9d9b3bb..112d99faf9 100644
--- a/examples/catalog/catalog_rhel.json
+++ b/examples/catalog/catalog_rhel.json
@@ -2691,8 +2691,8 @@
           "aarch64"
         ],
         "Type": "image",
-        "Tag": "1.1",
-        "Version": "1.1"
+        "Tag": "1.2",
+        "Version": "1.2"
       },
       "docker.io/dellhpcomniaaisolution/image-build-el10": {
         "Name": "docker.io/dellhpcomniaaisolution/image-build-el10",
diff --git a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
index fda0cb815e..33c8430053 100644
--- a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
+++ b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
@@ -1292,8 +1292,8 @@
           "aarch64"
         ],
         "Type": "image",
-        "Tag": "1.1",
-        "Version": "1.1"
+        "Tag": "1.2",
+        "Version": "1.2"
       },
       "docker.io/dellhpcomniaaisolution/image-build-el10": {
         "Name": "docker.io/dellhpcomniaaisolution/image-build-el10",
diff --git a/examples/catalog/catalog_rhel_with_nfs_provisioner.json b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
index 860fb775ab..1a81027b7a 100644
--- a/examples/catalog/catalog_rhel_with_nfs_provisioner.json
+++ b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
@@ -2564,8 +2564,8 @@
           "aarch64"
         ],
         "Type": "image",
-        "Tag": "1.1",
-        "Version": "1.1"
+        "Tag": "1.2",
+        "Version": "1.2"
       },
       "docker.io/dellhpcomniaaisolution/image-build-el10": {
         "Name": "docker.io/dellhpcomniaaisolution/image-build-el10",
diff --git a/input/config/aarch64/rhel/10.0/default_packages.json b/input/config/aarch64/rhel/10.0/default_packages.json
index dd012c36db..6f5c343349 100644
--- a/input/config/aarch64/rhel/10.0/default_packages.json
+++ b/input/config/aarch64/rhel/10.0/default_packages.json
@@ -35,7 +35,7 @@
       {"package": "cloud-init", "type": "rpm", "repo_name": "appstream"},
       {"package": "glibc-langpack-en", "type": "rpm", "repo_name": "baseos"},
       {"package": "gedit", "type": "rpm", "repo_name": "epel"},
-      { "package": "docker.io/dellhpcomniaaisolution/image-build-aarch64", "tag": "1.1", "type": "image" }
+      { "package": "docker.io/dellhpcomniaaisolution/image-build-aarch64", "tag": "1.2", "type": "image" }
     ]
   }
 }

From ff69de68c4802d58520d2680498bdecec6c25008 Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Fri, 12 Jun 2026 10:39:27 +0530
Subject: [PATCH 06/16] Checkmarx fix

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 common/library/module_utils/local_repo/download_common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/library/module_utils/local_repo/download_common.py b/common/library/module_utils/local_repo/download_common.py
index 0eff437663..e47a4c7023 100644
--- a/common/library/module_utils/local_repo/download_common.py
+++ b/common/library/module_utils/local_repo/download_common.py
@@ -1166,7 +1166,7 @@ def process_pip(package, status_file_path, content_base_dir, repo_name,
         logger.info(f"Package {package_name} processed successfully!")
 
     except Exception as e:
-        logger.error(f"Unexpected error while processing {package_name}: {str(e)}")
+        logger.error(f"Unexpected error while processing {package_name}: {e}")
         status = "Failed"
 
     finally:

From 10ce7ba426f2f96b278fbb0144786b57caebe1cf Mon Sep 17 00:00:00 2001
From: pullan1 <sudha.pullalaravu@dell.com>
Date: Fri, 12 Jun 2026 11:04:39 +0530
Subject: [PATCH 07/16] Checkmarx fix localrepo

Signed-off-by: pullan1 <sudha.pullalaravu@dell.com>
---
 common/library/module_utils/local_repo/download_common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/library/module_utils/local_repo/download_common.py b/common/library/module_utils/local_repo/download_common.py
index e47a4c7023..40dbff1c86 100644
--- a/common/library/module_utils/local_repo/download_common.py
+++ b/common/library/module_utils/local_repo/download_common.py
@@ -1165,8 +1165,8 @@ def process_pip(package, status_file_path, content_base_dir, repo_name,
 
         logger.info(f"Package {package_name} processed successfully!")
 
-    except Exception as e:
-        logger.error(f"Unexpected error while processing {package_name}: {e}")
+    except Exception:
+        logger.error(f"Unexpected error while processing {package_name}")
         status = "Failed"
 
     finally:

From 8e6ce36c1c8ee80ae318b3cacef7e3c396955514 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Fri, 12 Jun 2026 12:40:09 +0530
Subject: [PATCH 08/16] Catalog update for additional packages and powerscale

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 examples/catalog/catalog_rhel.json            | 572 +++++++++---------
 .../catalog_rhel_aarch64_with_slurm_only.json | 460 +++++++-------
 .../catalog_rhel_with_nfs_provisioner.json    | 496 +++++++--------
 examples/catalog/catalog_rhel_x86_64.json     |  60 +-
 .../catalog_rhel_x86_64_with_slurm_only.json  |  51 +-
 .../software_config.json                      |   7 +-
 6 files changed, 848 insertions(+), 798 deletions(-)

diff --git a/examples/catalog/catalog_rhel.json b/examples/catalog/catalog_rhel.json
index 112d99faf9..10f581d1bc 100644
--- a/examples/catalog/catalog_rhel.json
+++ b/examples/catalog/catalog_rhel.json
@@ -423,11 +423,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -549,11 +549,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -573,11 +573,11 @@
         "Type": "rpm_repo",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "doca"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "doca"
           }
         ]
@@ -957,11 +957,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1000,11 +1000,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           }
         ]
@@ -1112,11 +1112,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           }
         ]
@@ -1136,11 +1136,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1180,11 +1180,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1204,11 +1204,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1298,11 +1298,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           }
         ]
@@ -1322,11 +1322,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1346,11 +1346,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1408,11 +1408,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1480,11 +1480,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1504,11 +1504,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           }
         ]
@@ -1528,11 +1528,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "ldms"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "ldms"
           }
         ]
@@ -1552,11 +1552,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           }
         ]
@@ -1576,11 +1576,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1664,11 +1664,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1688,11 +1688,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "codeready-builder"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "codeready-builder"
           }
         ]
@@ -1712,11 +1712,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1736,11 +1736,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2030,11 +2030,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2054,11 +2054,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           }
         ]
@@ -2078,11 +2078,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2102,11 +2102,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2126,11 +2126,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2150,11 +2150,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2174,11 +2174,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2236,11 +2236,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2262,11 +2262,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2286,11 +2286,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2310,11 +2310,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2334,11 +2334,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2358,11 +2358,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2382,11 +2382,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2406,11 +2406,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2430,11 +2430,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2454,11 +2454,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2478,11 +2478,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2502,11 +2502,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2526,11 +2526,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2550,11 +2550,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2574,11 +2574,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2598,11 +2598,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2622,11 +2622,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2646,11 +2646,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2670,11 +2670,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2724,11 +2724,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2748,11 +2748,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2772,11 +2772,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2796,11 +2796,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2820,11 +2820,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2844,11 +2844,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2868,11 +2868,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2892,11 +2892,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2916,11 +2916,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2940,11 +2940,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2964,11 +2964,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2988,11 +2988,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3012,11 +3012,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3036,11 +3036,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -3060,11 +3060,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3084,11 +3084,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3108,11 +3108,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3132,11 +3132,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3156,11 +3156,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3180,11 +3180,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3204,11 +3204,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3228,11 +3228,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3252,11 +3252,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3276,11 +3276,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3300,11 +3300,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3324,11 +3324,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3348,11 +3348,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3372,11 +3372,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3396,11 +3396,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3420,11 +3420,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3444,11 +3444,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3468,11 +3468,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3492,11 +3492,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3516,11 +3516,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3540,11 +3540,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3564,11 +3564,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3588,11 +3588,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3612,11 +3612,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3636,11 +3636,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "codeready-builder"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "codeready-builder"
           }
         ]
@@ -3660,11 +3660,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3684,11 +3684,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3708,11 +3708,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3732,11 +3732,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -3756,11 +3756,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3780,11 +3780,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3805,11 +3805,11 @@
         "Version": "5.0.8",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-5.0.8.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-5.0.8.tar.gz"
           }
         ]
@@ -3829,11 +3829,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3853,11 +3853,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3877,11 +3877,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3901,11 +3901,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3925,11 +3925,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3949,11 +3949,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "ldms"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "ldms"
           }
         ]
@@ -3973,11 +3973,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3997,11 +3997,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4021,11 +4021,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4045,11 +4045,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4069,11 +4069,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4093,11 +4093,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4117,11 +4117,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "codeready-builder"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "codeready-builder"
           }
         ]
@@ -4141,11 +4141,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4165,11 +4165,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4189,11 +4189,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4213,11 +4213,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4237,11 +4237,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4261,11 +4261,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4285,11 +4285,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4309,11 +4309,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4333,11 +4333,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4357,11 +4357,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4381,11 +4381,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4405,11 +4405,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4429,11 +4429,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4454,11 +4454,11 @@
         "Version": "1.19.0",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/openucx/ucx/releases/download/v1.19.0/ucx-1.19.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/openucx/ucx/releases/download/v1.19.0/ucx-1.19.0.tar.gz"
           }
         ]
@@ -4478,11 +4478,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4502,11 +4502,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4526,11 +4526,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4550,11 +4550,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4574,11 +4574,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4598,11 +4598,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4622,11 +4622,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4635,9 +4635,9 @@
     "Miscellaneous": [],
     "InfrastructurePackages": {
       "csi-powerscale": {
-        "Name": "csi-powerscale-v2.16.0",
+        "Name": "csi-powerscale-v2.17.0",
         "Type": "git",
-        "Version": "v2.16.0",
+        "Version": "v2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4668,9 +4668,9 @@
         "Tag": "v0.6.0"
       },
       "external-snapshotter": {
-        "Name": "external-snapshotter-v8.4.0",
+        "Name": "external-snapshotter-v8.5.0",
         "Type": "git",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4687,9 +4687,9 @@
         ]
       },
       "helm-charts_1": {
-        "Name": "helm-charts-2.16.0",
+        "Name": "helm-charts-2.17.0",
         "Type": "git",
-        "Version": "csi-isilon-2.16.0",
+        "Version": "csi-isilon-2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4708,7 +4708,7 @@
       "quay.io/dell/container-storage-modules/csi-isilon": {
         "Name": "quay.io/dell/container-storage-modules/csi-isilon",
         "Type": "image",
-        "Version": "v2.16.0",
+        "Version": "v2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4717,12 +4717,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.16.0"
+        "Tag": "v2.17.0"
       },
       "quay.io/dell/container-storage-modules/csi-metadata-retriever": {
         "Name": "quay.io/dell/container-storage-modules/csi-metadata-retriever",
         "Type": "image",
-        "Version": "v1.13.0",
+        "Version": "v1.14.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4731,12 +4731,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.13.0"
+        "Tag": "v1.14.0"
       },
       "quay.io/dell/container-storage-modules/csm-authorization-sidecar": {
         "Name": "quay.io/dell/container-storage-modules/csm-authorization-sidecar",
         "Type": "image",
-        "Version": "v2.4.0",
+        "Version": "v2.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4745,12 +4745,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.4.0"
+        "Tag": "v2.5.0"
       },
       "quay.io/dell/container-storage-modules/dell-csi-replicator": {
         "Name": "quay.io/dell/container-storage-modules/dell-csi-replicator",
         "Type": "image",
-        "Version": "v1.14.0",
+        "Version": "v1.15.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4759,12 +4759,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.14.0"
+        "Tag": "v1.15.0"
       },
       "quay.io/dell/container-storage-modules/podmon": {
         "Name": "quay.io/dell/container-storage-modules/podmon",
         "Type": "image",
-        "Version": "v1.15.0",
+        "Version": "v1.16.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4773,12 +4773,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.15.0"
+        "Tag": "v1.16.0"
       },
       "registry.k8s.io/sig-storage/csi-attacher": {
         "Name": "registry.k8s.io/sig-storage/csi-attacher",
         "Type": "image",
-        "Version": "v4.10.0",
+        "Version": "v4.11.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4787,12 +4787,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v4.10.0"
+        "Tag": "v4.11.0"
       },
       "registry.k8s.io/sig-storage/csi-external-health-monitor-controller": {
         "Name": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller",
         "Type": "image",
-        "Version": "v0.16.0",
+        "Version": "v0.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4801,12 +4801,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v0.16.0"
+        "Tag": "v0.17.0"
       },
       "registry.k8s.io/sig-storage/csi-node-driver-registrar": {
         "Name": "registry.k8s.io/sig-storage/csi-node-driver-registrar",
         "Type": "image",
-        "Version": "v2.15.0",
+        "Version": "v2.16.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4815,12 +4815,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.15.0"
+        "Tag": "v2.16.0"
       },
       "registry.k8s.io/sig-storage/csi-provisioner": {
         "Name": "registry.k8s.io/sig-storage/csi-provisioner",
         "Type": "image",
-        "Version": "v6.1.0",
+        "Version": "v6.2.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4829,12 +4829,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v6.1.0"
+        "Tag": "v6.2.0"
       },
       "registry.k8s.io/sig-storage/csi-resizer": {
         "Name": "registry.k8s.io/sig-storage/csi-resizer",
         "Type": "image",
-        "Version": "v2.0.0",
+        "Version": "v2.1.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4843,12 +4843,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.0.0"
+        "Tag": "v2.1.0"
       },
       "registry.k8s.io/sig-storage/csi-snapshotter": {
         "Name": "registry.k8s.io/sig-storage/csi-snapshotter",
         "Type": "image",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4857,12 +4857,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v8.4.0"
+        "Tag": "v8.5.0"
       },
       "registry.k8s.io/sig-storage/snapshot-controller": {
         "Name": "registry.k8s.io/sig-storage/snapshot-controller",
         "Type": "image",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4871,7 +4871,7 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v8.4.0"
+        "Tag": "v8.5.0"
       }
     }
   }
diff --git a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
index 33c8430053..166a85a067 100644
--- a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
+++ b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json
@@ -226,11 +226,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -250,11 +250,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -274,11 +274,11 @@
         "Type": "rpm_repo",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "doca"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "doca"
           }
         ]
@@ -298,11 +298,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -322,11 +322,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           }
         ]
@@ -346,11 +346,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           }
         ]
@@ -370,11 +370,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -394,11 +394,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -418,11 +418,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -442,11 +442,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           }
         ]
@@ -466,11 +466,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -490,11 +490,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -533,11 +533,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -573,11 +573,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           }
         ]
@@ -597,11 +597,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           }
         ]
@@ -621,11 +621,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -645,11 +645,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -669,11 +669,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -693,11 +693,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -717,11 +717,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           }
         ]
@@ -741,11 +741,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -765,11 +765,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -789,11 +789,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -813,11 +813,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -837,11 +837,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -863,11 +863,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -887,11 +887,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -911,11 +911,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -935,11 +935,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -959,11 +959,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -983,11 +983,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1007,11 +1007,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1031,11 +1031,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1055,11 +1055,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1079,11 +1079,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1103,11 +1103,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1127,11 +1127,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -1151,11 +1151,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1175,11 +1175,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1199,11 +1199,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1223,11 +1223,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1247,11 +1247,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1271,11 +1271,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1325,11 +1325,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1349,11 +1349,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1373,11 +1373,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1397,11 +1397,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1421,11 +1421,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1445,11 +1445,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1469,11 +1469,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -1493,11 +1493,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1517,11 +1517,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1541,11 +1541,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1565,11 +1565,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1589,11 +1589,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1613,11 +1613,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1637,11 +1637,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -1661,11 +1661,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1685,11 +1685,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1709,11 +1709,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1733,11 +1733,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1757,11 +1757,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1781,11 +1781,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1805,11 +1805,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1829,11 +1829,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1853,11 +1853,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1877,11 +1877,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1901,11 +1901,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1925,11 +1925,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1949,11 +1949,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1973,11 +1973,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1997,11 +1997,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2021,11 +2021,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2045,11 +2045,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2069,11 +2069,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2093,11 +2093,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2117,11 +2117,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2141,11 +2141,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2165,11 +2165,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2189,11 +2189,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2213,11 +2213,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2237,11 +2237,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2261,11 +2261,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2285,11 +2285,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2309,11 +2309,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2333,11 +2333,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2357,11 +2357,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2381,11 +2381,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2405,11 +2405,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2429,11 +2429,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2453,11 +2453,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2477,11 +2477,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2501,11 +2501,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2525,11 +2525,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2549,11 +2549,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2573,11 +2573,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2597,11 +2597,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2621,11 +2621,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2645,11 +2645,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2669,11 +2669,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2693,11 +2693,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2717,11 +2717,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2741,11 +2741,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2765,11 +2765,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2789,11 +2789,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2813,11 +2813,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2837,11 +2837,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2861,11 +2861,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2885,11 +2885,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2909,11 +2909,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2933,11 +2933,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2957,11 +2957,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2981,11 +2981,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3005,11 +3005,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3029,11 +3029,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
diff --git a/examples/catalog/catalog_rhel_with_nfs_provisioner.json b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
index 1a81027b7a..307d14bfd5 100644
--- a/examples/catalog/catalog_rhel_with_nfs_provisioner.json
+++ b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
@@ -392,11 +392,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -518,11 +518,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -542,11 +542,11 @@
         "Type": "rpm_repo",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "doca"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "doca"
           }
         ]
@@ -926,11 +926,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -969,11 +969,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
           }
         ]
@@ -1081,11 +1081,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
           }
         ]
@@ -1105,11 +1105,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1149,11 +1149,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1173,11 +1173,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1267,11 +1267,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
           }
         ]
@@ -1291,11 +1291,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1315,11 +1315,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1377,11 +1377,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1449,11 +1449,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
           }
         ]
@@ -1473,11 +1473,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
           }
         ]
@@ -1497,11 +1497,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1585,11 +1585,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -1609,11 +1609,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1903,11 +1903,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -1927,11 +1927,11 @@
         "Type": "tarball",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
           }
         ]
@@ -1951,11 +1951,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -1975,11 +1975,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -1999,11 +1999,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2023,11 +2023,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2047,11 +2047,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "slurm_custom"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "slurm_custom"
           }
         ]
@@ -2109,11 +2109,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2135,11 +2135,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2159,11 +2159,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2183,11 +2183,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2207,11 +2207,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2231,11 +2231,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2255,11 +2255,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2279,11 +2279,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2303,11 +2303,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2327,11 +2327,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2351,11 +2351,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2375,11 +2375,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2399,11 +2399,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2423,11 +2423,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2447,11 +2447,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2471,11 +2471,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2495,11 +2495,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2519,11 +2519,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2543,11 +2543,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2597,11 +2597,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2621,11 +2621,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2645,11 +2645,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2669,11 +2669,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2693,11 +2693,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2717,11 +2717,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2741,11 +2741,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2765,11 +2765,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2789,11 +2789,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2813,11 +2813,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2837,11 +2837,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2861,11 +2861,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2885,11 +2885,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -2909,11 +2909,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -2933,11 +2933,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2957,11 +2957,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -2981,11 +2981,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3005,11 +3005,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3029,11 +3029,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3053,11 +3053,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3077,11 +3077,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3101,11 +3101,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3125,11 +3125,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3149,11 +3149,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3173,11 +3173,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3197,11 +3197,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3221,11 +3221,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3245,11 +3245,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3269,11 +3269,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3293,11 +3293,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3317,11 +3317,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3341,11 +3341,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3365,11 +3365,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3389,11 +3389,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3413,11 +3413,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3437,11 +3437,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3461,11 +3461,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3485,11 +3485,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3509,11 +3509,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "codeready-builder"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "codeready-builder"
           }
         ]
@@ -3533,11 +3533,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3557,11 +3557,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3581,11 +3581,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3605,11 +3605,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "epel"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "epel"
           }
         ]
@@ -3629,11 +3629,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3653,11 +3653,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3678,11 +3678,11 @@
         "Version": "5.0.8",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-5.0.8.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-5.0.8.tar.gz"
           }
         ]
@@ -3702,11 +3702,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3726,11 +3726,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3750,11 +3750,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3774,11 +3774,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3798,11 +3798,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3822,11 +3822,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "ldms"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "ldms"
           }
         ]
@@ -3846,11 +3846,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3870,11 +3870,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3894,11 +3894,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3918,11 +3918,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -3942,11 +3942,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3966,11 +3966,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -3990,11 +3990,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "codeready-builder"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "codeready-builder"
           }
         ]
@@ -4014,11 +4014,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4038,11 +4038,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4062,11 +4062,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4086,11 +4086,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4110,11 +4110,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4134,11 +4134,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4158,11 +4158,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4182,11 +4182,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4206,11 +4206,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4230,11 +4230,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4254,11 +4254,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4278,11 +4278,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4302,11 +4302,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4327,11 +4327,11 @@
         "Version": "1.19.0",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "Uri": "https://github.com/openucx/ucx/releases/download/v1.19.0/ucx-1.19.0.tar.gz"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "Uri": "https://github.com/openucx/ucx/releases/download/v1.19.0/ucx-1.19.0.tar.gz"
           }
         ]
@@ -4351,11 +4351,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4375,11 +4375,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4399,11 +4399,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4423,11 +4423,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4447,11 +4447,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "appstream"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "appstream"
           }
         ]
@@ -4471,11 +4471,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
@@ -4495,11 +4495,11 @@
         "Type": "rpm",
         "Sources": [
           {
-            "Architecture": "x86_64",
+            "Architecture": "aarch64",
             "RepoName": "baseos"
           },
           {
-            "Architecture": "aarch64",
+            "Architecture": "x86_64",
             "RepoName": "baseos"
           }
         ]
diff --git a/examples/catalog/catalog_rhel_x86_64.json b/examples/catalog/catalog_rhel_x86_64.json
index 85d1a666ea..9a643429d3 100644
--- a/examples/catalog/catalog_rhel_x86_64.json
+++ b/examples/catalog/catalog_rhel_x86_64.json
@@ -3980,9 +3980,9 @@
     "Miscellaneous": [],
     "InfrastructurePackages": {
       "csi-powerscale": {
-        "Name": "csi-powerscale-v2.16.0",
+        "Name": "csi-powerscale-v2.17.0",
         "Type": "git",
-        "Version": "v2.16.0",
+        "Version": "v2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4013,9 +4013,9 @@
         "Tag": "v0.6.0"
       },
       "external-snapshotter": {
-        "Name": "external-snapshotter-v8.4.0",
+        "Name": "external-snapshotter-v8.5.0",
         "Type": "git",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4032,9 +4032,9 @@
         ]
       },
       "helm-charts_1": {
-        "Name": "helm-charts-2.16.0",
+        "Name": "helm-charts-2.17.0",
         "Type": "git",
-        "Version": "csi-isilon-2.16.0",
+        "Version": "csi-isilon-2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4053,7 +4053,7 @@
       "quay.io/dell/container-storage-modules/csi-isilon": {
         "Name": "quay.io/dell/container-storage-modules/csi-isilon",
         "Type": "image",
-        "Version": "v2.16.0",
+        "Version": "v2.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4062,12 +4062,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.16.0"
+        "Tag": "v2.17.0"
       },
       "quay.io/dell/container-storage-modules/csi-metadata-retriever": {
         "Name": "quay.io/dell/container-storage-modules/csi-metadata-retriever",
         "Type": "image",
-        "Version": "v1.13.0",
+        "Version": "v1.14.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4076,12 +4076,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.13.0"
+        "Tag": "v1.14.0"
       },
       "quay.io/dell/container-storage-modules/csm-authorization-sidecar": {
         "Name": "quay.io/dell/container-storage-modules/csm-authorization-sidecar",
         "Type": "image",
-        "Version": "v2.4.0",
+        "Version": "v2.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4090,12 +4090,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.4.0"
+        "Tag": "v2.5.0"
       },
       "quay.io/dell/container-storage-modules/dell-csi-replicator": {
         "Name": "quay.io/dell/container-storage-modules/dell-csi-replicator",
         "Type": "image",
-        "Version": "v1.14.0",
+        "Version": "v1.15.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4104,12 +4104,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.14.0"
+        "Tag": "v1.15.0"
       },
       "quay.io/dell/container-storage-modules/podmon": {
         "Name": "quay.io/dell/container-storage-modules/podmon",
         "Type": "image",
-        "Version": "v1.15.0",
+        "Version": "v1.16.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4118,12 +4118,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v1.15.0"
+        "Tag": "v1.16.0"
       },
       "registry.k8s.io/sig-storage/csi-attacher": {
         "Name": "registry.k8s.io/sig-storage/csi-attacher",
         "Type": "image",
-        "Version": "v4.10.0",
+        "Version": "v4.11.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4132,12 +4132,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v4.10.0"
+        "Tag": "v4.11.0"
       },
       "registry.k8s.io/sig-storage/csi-external-health-monitor-controller": {
         "Name": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller",
         "Type": "image",
-        "Version": "v0.16.0",
+        "Version": "v0.17.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4146,12 +4146,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v0.16.0"
+        "Tag": "v0.17.0"
       },
       "registry.k8s.io/sig-storage/csi-node-driver-registrar": {
         "Name": "registry.k8s.io/sig-storage/csi-node-driver-registrar",
         "Type": "image",
-        "Version": "v2.15.0",
+        "Version": "v2.16.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4160,12 +4160,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.15.0"
+        "Tag": "v2.16.0"
       },
       "registry.k8s.io/sig-storage/csi-provisioner": {
         "Name": "registry.k8s.io/sig-storage/csi-provisioner",
         "Type": "image",
-        "Version": "v6.1.0",
+        "Version": "v6.2.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4174,12 +4174,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v6.1.0"
+        "Tag": "v6.2.0"
       },
       "registry.k8s.io/sig-storage/csi-resizer": {
         "Name": "registry.k8s.io/sig-storage/csi-resizer",
         "Type": "image",
-        "Version": "v2.0.0",
+        "Version": "v2.1.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4188,12 +4188,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v2.0.0"
+        "Tag": "v2.1.0"
       },
       "registry.k8s.io/sig-storage/csi-snapshotter": {
         "Name": "registry.k8s.io/sig-storage/csi-snapshotter",
         "Type": "image",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4202,12 +4202,12 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v8.4.0"
+        "Tag": "v8.5.0"
       },
       "registry.k8s.io/sig-storage/snapshot-controller": {
         "Name": "registry.k8s.io/sig-storage/snapshot-controller",
         "Type": "image",
-        "Version": "v8.4.0",
+        "Version": "v8.5.0",
         "SupportedFunctions": [
           {
             "Name": "csi"
@@ -4216,7 +4216,7 @@
         "Architecture": [
           "x86_64"
         ],
-        "Tag": "v8.4.0"
+        "Tag": "v8.5.0"
       }
     }
   }
diff --git a/examples/catalog/catalog_rhel_x86_64_with_slurm_only.json b/examples/catalog/catalog_rhel_x86_64_with_slurm_only.json
index 906cc8908e..cbb80300ba 100644
--- a/examples/catalog/catalog_rhel_x86_64_with_slurm_only.json
+++ b/examples/catalog/catalog_rhel_x86_64_with_slurm_only.json
@@ -69,6 +69,7 @@
           "mariadb-server",
           "msr-safe",
           "munge",
+          "nano",
           "nvcr.io/nvidia/hpc-benchmarks",
           "osu-micro-benchmarks",
           "papi",
@@ -78,7 +79,8 @@
           "sg3_utils",
           "sionlib",
           "slurm-slurmctld",
-          "slurm-slurmdbd"
+          "slurm-slurmdbd",
+          "tree"
         ]
       },
       {
@@ -97,6 +99,7 @@
           "lsscsi",
           "msr-safe",
           "munge",
+          "nano",
           "nvcr.io/nvidia/hpc-benchmarks",
           "osu-micro-benchmarks",
           "papi",
@@ -105,7 +108,8 @@
           "sg3_utils",
           "sionlib",
           "slurm-pam_slurm",
-          "slurm-slurmd"
+          "slurm-slurmd",
+          "tree"
         ]
       }
     ],
@@ -478,6 +482,25 @@
           }
         ]
       },
+      "nano": {
+        "Name": "nano",
+        "SupportedOS": [
+          {
+            "Name": "RHEL",
+            "Version": "10.0"
+          }
+        ],
+        "Architecture": [
+          "x86_64"
+        ],
+        "Type": "rpm",
+        "Sources": [
+          {
+            "Architecture": "x86_64",
+            "RepoName": "baseos"
+          }
+        ]
+      },
       "nvcr.io/nvidia/hpc-benchmarks": {
         "Name": "nvcr.io/nvidia/hpc-benchmarks",
         "SupportedOS": [
@@ -720,6 +743,25 @@
             "RepoName": "slurm_custom"
           }
         ]
+      },
+      "tree": {
+        "Name": "tree",
+        "SupportedOS": [
+          {
+            "Name": "RHEL",
+            "Version": "10.0"
+          }
+        ],
+        "Architecture": [
+          "x86_64"
+        ],
+        "Type": "rpm",
+        "Sources": [
+          {
+            "Architecture": "x86_64",
+            "RepoName": "baseos"
+          }
+        ]
       }
     },
     "OSPackages": {
@@ -2449,7 +2491,10 @@
         ]
       }
     },
-    "Miscellaneous": [],
+    "Miscellaneous": [
+      "nano",
+      "tree"
+    ],
     "InfrastructurePackages": {}
   }
 }
\ No newline at end of file
diff --git a/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/software_config.json b/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/software_config.json
index ef6549faea..4ed73341ba 100644
--- a/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/software_config.json
+++ b/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/software_config.json
@@ -6,12 +6,17 @@
         {"name": "default_packages", "arch": ["x86_64"]},
         {"name": "admin_debug_packages", "arch": ["x86_64"]},
         {"name": "openldap", "arch": ["x86_64"]},
-        {"name": "slurm_custom", "arch": ["x86_64"]}
+        {"name": "slurm_custom", "arch": ["x86_64"]},
+        {"name": "additional_packages", "arch": ["x86_64"]}
     ],
     "slurm_custom": [
         {"name": "slurm_control_node"},
         {"name": "slurm_node"},
         {"name": "login_node"},
         {"name": "login_compiler_node"}
+    ],
+    "additional_packages": [
+        {"name": "slurm_control_node"},
+        {"name": "slurm_node"} 
     ]
 }

From 450d8766090d827f2ec1c2fc1986699895038ca7 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Fri, 12 Jun 2026 13:57:38 +0530
Subject: [PATCH 09/16] Create additional_packages.json

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 .../additional_packages.json                  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/additional_packages.json

diff --git a/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/additional_packages.json b/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/additional_packages.json
new file mode 100644
index 0000000000..08b576cf59
--- /dev/null
+++ b/examples/catalog/mapping_file_software_config/catalog_rhel_x86_64_with_slurm_only_json/additional_packages.json
@@ -0,0 +1,49 @@
+{
+    "additional_packages": {
+        "cluster": [
+
+        ]
+    },
+    "service_kube_control_plane_first": {
+        "cluster": [
+
+        ]
+    },
+    "service_kube_control_plane": {
+        "cluster": [
+
+        ]
+    },
+    "service_kube_node": {
+        "cluster": [
+
+        ]
+    },
+    "slurm_control_node": {
+        "cluster": [
+            {"package": "nano", "type": "rpm", "repo_name": "baseos"},
+            {"package": "tree", "type": "rpm", "repo_name": "baseos"}
+        ]
+    },
+    "slurm_node": {
+        "cluster": [
+            {"package": "nano", "type": "rpm", "repo_name": "baseos"},
+            {"package": "tree", "type": "rpm", "repo_name": "baseos"}
+        ]
+    },
+    "login_node": {
+        "cluster": [
+
+        ]
+    },
+    "login_compiler_node": {
+        "cluster": [
+
+        ]
+    },
+    "os": {
+        "cluster": [
+
+        ]
+    }
+}

From fd5e428df8247f0f3cb00ca5d52364f4852676bc Mon Sep 17 00:00:00 2001
From: Jagadeesh N V <39791839+jagadeeshnv@users.noreply.github.com>
Date: Fri, 12 Jun 2026 14:02:23 +0530
Subject: [PATCH 10/16] Merge pull request #4747 from
 jagadeeshnv/pub/q2_upgrade

Fix: Separate input validation flow for build and deploy
---
 build_image_aarch64/build_image_aarch64.yml | 11 ++++++++++-
 build_image_x86_64/build_image_x86_64.yml   | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/build_image_aarch64/build_image_aarch64.yml b/build_image_aarch64/build_image_aarch64.yml
index 4faed8e057..23e7800089 100644
--- a/build_image_aarch64/build_image_aarch64.yml
+++ b/build_image_aarch64/build_image_aarch64.yml
@@ -20,11 +20,20 @@
   hosts: localhost
   connection: local
   tags: always
+  vars:
+    build_tags:
+      - "build_aarch_image"
+  pre_tasks:
+    - name: Check if config file exists
+      ansible.builtin.set_fact:
+        build_tags:
+          - "software_config"
+      when: functional_groups is defined
   tasks:
     - name: Set dynamic run tags including 'build_aarch_image'
       when: not config_file_status | default(false) | bool
       ansible.builtin.set_fact:
-        omnia_run_tags: "{{ (ansible_run_tags | default([]) | list + ['build_aarch_image']) | unique }}"
+        omnia_run_tags: "{{ (ansible_run_tags | default([]) | list + build_tags | default([]) | list) | unique }}"
         cacheable: true
 
 - name: Invoke validate_config.yml to perform L1 and L2 validations with build_image tag
diff --git a/build_image_x86_64/build_image_x86_64.yml b/build_image_x86_64/build_image_x86_64.yml
index 7cf90772e8..9cb7ac02d2 100644
--- a/build_image_x86_64/build_image_x86_64.yml
+++ b/build_image_x86_64/build_image_x86_64.yml
@@ -20,11 +20,20 @@
   hosts: localhost
   connection: local
   tags: always
+  vars:
+    build_tags:
+      - "build_image"
+  pre_tasks:
+    - name: Check if config file exists
+      ansible.builtin.set_fact:
+        build_tags:
+          - "software_config"
+      when: functional_groups is defined
   tasks:
     - name: Set dynamic run tags including 'build_image'
       when: not config_file_status | default(false) | bool
       ansible.builtin.set_fact:
-        omnia_run_tags: "{{ (ansible_run_tags | default([]) | list + ['build_image']) | unique }}"
+        omnia_run_tags: "{{ (ansible_run_tags | default([]) | list + build_tags | default([]) | list) | unique }}"
         cacheable: true
 
 - name: Invoke validate_config.yml to perform L1 and L2 validations with build_image tag

From e29939032dd0727cf17a43f79635b429d14b084e Mon Sep 17 00:00:00 2001
From: Sujit Jadhav <sujit.jadhav@dell.com>
Date: Fri, 12 Jun 2026 14:30:05 +0530
Subject: [PATCH 11/16] fix: add ADMIN_IP subnet consistency validation for PXE
 mapping (#4746)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add input validation to ensure ADMIN_IP addresses in the PXE mapping
file (pxe_mapping_file.csv) belong to a subnet defined in
network_spec.yml — either the primary admin_network or one of the
additional_subnets.

Previously this check only ran during HA validation. Now it runs for
all deployments in validate_provision_config, catching Scenario 1 of
the multi-subnet DHCP defect where ADMIN_IPs from undefined subnets
passed validation silently.

Changes:
- Extract validate_pxe_admin_ips_subnet_consistency() as a standalone
  testable function in provision_validation.py
- Import is_ip_in_subnet directly; no cross-dependency on HA-specific
  vip_pxe_validation module
- Guard against yaml.safe_load returning None for empty network_spec
- Produce clear error messages referencing primary admin subnet and
  additional_subnets (no misleading VIP references)
- Add 6 unit tests exercising the production code path directly

Signed-off-by: Sujit Jadhav <sujit.jadhav@dell.com>
---
 .../validation_flows/provision_validation.py  | 104 +++++++++++++++--
 .../test_additional_subnets_validation.py     | 109 ++++++++++++++++++
 2 files changed, 206 insertions(+), 7 deletions(-)

diff --git a/common/library/module_utils/input_validation/validation_flows/provision_validation.py b/common/library/module_utils/input_validation/validation_flows/provision_validation.py
index e5b1a673c7..23cdd1efb4 100644
--- a/common/library/module_utils/input_validation/validation_flows/provision_validation.py
+++ b/common/library/module_utils/input_validation/validation_flows/provision_validation.py
@@ -25,6 +25,7 @@
 from ansible.module_utils.input_validation.common_utils import validation_utils
 from ansible.module_utils.input_validation.common_utils import config
 from ansible.module_utils.input_validation.common_utils import en_us_validation_msg
+from ansible.module_utils.input_validation.common_utils.validation_utils import is_ip_in_subnet
 from ansible.module_utils.input_validation.validation_flows import common_validation
 
 file_names = config.files
@@ -861,6 +862,68 @@ def validate_parent_service_tag_hierarchy(pxe_mapping_file_path):
 #
 #     return errors
 
+
+def validate_pxe_admin_ips_subnet_consistency(
+        errors, pxe_mapping_file_path, oim_admin_ip, admin_netmaskbits,
+        additional_subnets=None):
+    """
+    Validate that every ADMIN_IP in the PXE mapping file belongs to a known
+    subnet: either the primary admin subnet or one of the additional_subnets
+    defined in network_spec.yml.
+
+    Args:
+        errors (list): List to append error messages to.
+        pxe_mapping_file_path (str): Path to the PXE mapping CSV file.
+        oim_admin_ip (str): Primary OIM admin IP address.
+        admin_netmaskbits (str): Netmask bits for the primary admin subnet.
+        additional_subnets (list, optional): List of additional subnet dicts
+            with 'subnet' and 'netmask_bits' keys.
+    """
+    if additional_subnets is None:
+        additional_subnets = []
+
+    pxe_admin_ips = []
+    try:
+        with open(pxe_mapping_file_path, "r", encoding="utf-8") as fh:
+            raw_lines = [ln for ln in fh.readlines()
+                         if ln.strip() and not ln.strip().startswith('#')]
+        reader = csv.DictReader(raw_lines)
+        fieldname_map = {fn.strip().upper(): fn for fn in reader.fieldnames}
+        admin_ip_col = fieldname_map.get("ADMIN_IP")
+        if admin_ip_col:
+            for row in reader:
+                val = (row.get(admin_ip_col) or "").strip()
+                if val and validation_utils.validate_ipv4(val):
+                    pxe_admin_ips.append(val)
+    except (OSError, csv.Error):
+        return
+
+    for host_ip in pxe_admin_ips:
+        if is_ip_in_subnet(oim_admin_ip, admin_netmaskbits, host_ip):
+            continue
+        in_additional = any(
+            is_ip_in_subnet(
+                s.get("subnet", ""),
+                s.get("netmask_bits", ""),
+                host_ip
+            )
+            for s in additional_subnets
+            if s.get("subnet") and s.get("netmask_bits")
+        )
+        if not in_additional:
+            errors.append(
+                create_error_msg(
+                    "ADMIN_IP subnet consistency",
+                    host_ip,
+                    f"Node ADMIN_IP {host_ip} does not belong to the primary "
+                    f"admin subnet ({oim_admin_ip}/{admin_netmaskbits}) or any "
+                    "subnet defined in network_spec.yml additional_subnets. "
+                    "Please ensure all ADMIN_IPs in the PXE mapping file are "
+                    "covered by a subnet in network_spec.yml."
+                )
+            )
+
+
 def validate_aarch64_local_path_compatibility(pxe_mapping_file_path):
     """
     Validates that aarch64 nodes are not present when using local share path.
@@ -1256,13 +1319,40 @@ def validate_provision_config(
             validate_aarch64_local_path_compatibility(pxe_mapping_file_path)
             validate_functional_groups_software_consistency(pxe_mapping_file_path, software_config_json, logger)
 
-            # Validate ADMIN_IPs against network_spec.yml ranges
-            # network_spec_path = create_file_path(input_file_path, file_names["network_spec"])
-            # if os.path.isfile(network_spec_path):
-            #     admin_ip_errors = validate_admin_ips_against_network_spec(
-            #         pxe_mapping_file_path, network_spec_path
-            #     )
-            #     errors.extend(admin_ip_errors)
+            # Validate ADMIN_IPs against network_spec.yml subnets (including additional_subnets)
+            network_spec_path = create_file_path(input_file_path, file_names["network_spec"])
+            if os.path.isfile(network_spec_path):
+                try:
+                    with open(network_spec_path, "r", encoding="utf-8") as f:
+                        network_spec_json = yaml.safe_load(f)
+
+                    # Extract admin network configuration
+                    admin_netmaskbits = None
+                    oim_admin_ip = None
+                    additional_subnets = []
+
+                    for network in (network_spec_json or {}).get("Networks", []):
+                        if "admin_network" in network and isinstance(network["admin_network"], dict):
+                            admin_net = network["admin_network"]
+                            admin_netmaskbits = admin_net.get("netmask_bits")
+                            oim_admin_ip = admin_net.get("primary_oim_admin_ip")
+                            additional_subnets = admin_net.get("additional_subnets") or []
+                            break
+
+                    if admin_netmaskbits and oim_admin_ip:
+                        validate_pxe_admin_ips_subnet_consistency(
+                            errors, pxe_mapping_file_path,
+                            oim_admin_ip, admin_netmaskbits,
+                            additional_subnets
+                        )
+                except (yaml.YAMLError, IOError) as e:
+                    errors.append(
+                        create_error_msg(
+                            "network_spec.yml",
+                            network_spec_path,
+                            f"Failed to load or parse network_spec.yml: {str(e)}"
+                        )
+                    )
         except ValueError as e:
             errors.append(
                 create_error_msg(
diff --git a/common/library/modules/tests/test_additional_subnets_validation.py b/common/library/modules/tests/test_additional_subnets_validation.py
index a3df22c629..62d60b112f 100644
--- a/common/library/modules/tests/test_additional_subnets_validation.py
+++ b/common/library/modules/tests/test_additional_subnets_validation.py
@@ -73,9 +73,16 @@
     types.ModuleType("ansible.module_utils.input_validation.validation_flows.common_validation")
 )
 
+# Register is_ip_in_subnet on the validation_utils stub so provision_validation can import it
+_vu_mod = sys.modules["ansible.module_utils.input_validation.common_utils.validation_utils"]
+if not hasattr(_vu_mod, "is_ip_in_subnet"):
+    import input_validation.common_utils.validation_utils as _real_vu
+    setattr(_vu_mod, "is_ip_in_subnet", _real_vu.is_ip_in_subnet)
+
 from input_validation.validation_flows.provision_validation import (  # noqa: E402
     _validate_additional_subnets,
     _ranges_overlap,
+    validate_pxe_admin_ips_subnet_consistency,
 )
 
 
@@ -254,5 +261,107 @@ def test_dynamic_range_overlap_between_subnets(self):
         self.assertEqual(errors, [])
 
 
+class TestPXEMappingSubnetValidation(unittest.TestCase):
+    """Tests for validate_pxe_admin_ips_subnet_consistency."""
+
+    def _create_temp_pxe_mapping(self, admin_ips):
+        """Create a temporary PXE mapping file with given ADMIN_IPs."""
+        import tempfile
+        fd, path = tempfile.mkstemp(suffix=".csv")
+        with os.fdopen(fd, "w", encoding="utf-8") as f:
+            f.write("FUNCTIONAL_GROUP_NAME,GROUP_NAME,SERVICE_TAG,PARENT_SERVICE_TAG,HOSTNAME,ADMIN_MAC,ADMIN_IP,BMC_MAC,BMC_IP\n")
+            for i, admin_ip in enumerate(admin_ips):
+                f.write(f"slurm_node,grp0,SVCTAG{i},,node{i},00:11:22:33:44:55,{admin_ip},00:11:22:33:44:66,10.0.0.1\n")
+        return path
+
+    def test_admin_ip_in_admin_subnet(self):
+        """ADMIN_IP in primary admin subnet should pass validation."""
+        pxe_file = self._create_temp_pxe_mapping(["172.16.0.10"])
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", []
+            )
+            self.assertEqual(errors, [])
+        finally:
+            os.unlink(pxe_file)
+
+    def test_admin_ip_in_additional_subnet(self):
+        """ADMIN_IP in additional subnet should pass validation."""
+        pxe_file = self._create_temp_pxe_mapping(["10.40.1.10"])
+        additional = [{
+            "subnet": TEST_SUBNET_1,
+            "netmask_bits": "24",
+            "router": TEST_ROUTER_1,
+            "dynamic_range": "10.40.1.100-10.40.1.200",
+        }]
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", additional
+            )
+            self.assertEqual(errors, [])
+        finally:
+            os.unlink(pxe_file)
+
+    def test_admin_ip_in_undefined_subnet(self):
+        """ADMIN_IP in undefined subnet should fail validation."""
+        pxe_file = self._create_temp_pxe_mapping(["192.168.100.10"])
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", []
+            )
+            self.assertTrue(len(errors) > 0)
+            self.assertTrue("192.168.100.10" in str(errors))
+        finally:
+            os.unlink(pxe_file)
+
+    def test_admin_ip_in_additional_subnet_undefined_in_network_spec(self):
+        """ADMIN_IP in subnet not defined in additional_subnets should fail validation."""
+        pxe_file = self._create_temp_pxe_mapping(["10.40.2.10"])
+        additional = [{
+            "subnet": TEST_SUBNET_1,
+            "netmask_bits": "24",
+            "router": TEST_ROUTER_1,
+            "dynamic_range": "10.40.1.100-10.40.1.200",
+        }]
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", additional
+            )
+            self.assertTrue(len(errors) > 0)
+            self.assertTrue("10.40.2.10" in str(errors))
+        finally:
+            os.unlink(pxe_file)
+
+    def test_mixed_valid_and_invalid_admin_ips(self):
+        """Mix of valid (in admin subnet) and invalid (undefined subnet) ADMIN_IPs."""
+        pxe_file = self._create_temp_pxe_mapping(["172.16.0.10", "192.168.100.10"])
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", []
+            )
+            self.assertEqual(len(errors), 1)
+            self.assertTrue("192.168.100.10" in str(errors))
+            self.assertFalse("172.16.0.10" in str(errors))
+        finally:
+            os.unlink(pxe_file)
+
+    def test_no_additional_subnets_defaults_to_empty(self):
+        """Passing None for additional_subnets should not crash."""
+        pxe_file = self._create_temp_pxe_mapping(["172.16.0.10"])
+        errors = []
+        try:
+            validate_pxe_admin_ips_subnet_consistency(
+                errors, pxe_file, TEST_ADMIN_IP, "24", None
+            )
+            self.assertEqual(errors, [])
+        finally:
+            os.unlink(pxe_file)
+
+
 if __name__ == "__main__":
     unittest.main()

From 094334037cb650ed61bcc7588ca1c6f447c54f99 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Fri, 12 Jun 2026 15:05:57 +0530
Subject: [PATCH 12/16] Update adapter_policy.py

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 build_stream/core/catalog/adapter_policy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_stream/core/catalog/adapter_policy.py b/build_stream/core/catalog/adapter_policy.py
index bb8d52f740..bdde0fcade 100644
--- a/build_stream/core/catalog/adapter_policy.py
+++ b/build_stream/core/catalog/adapter_policy.py
@@ -39,7 +39,7 @@
 _DEFAULT_SCHEMA_PATH = os.path.join(_BASE_DIR, "resources", "AdapterPolicySchema.json")
 
 _K8S_VERSION = "1.35.1"
-_CSI_VERSION = "v2.16.0"
+_CSI_VERSION = "v2.17.0"
 
 
 def _validate_input_policy_and_schema_paths(

From ac296987ba6652746667d39e1aa2fc2ef9a26738 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Fri, 12 Jun 2026 15:07:22 +0530
Subject: [PATCH 13/16] Delete catalog_rhel.json

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 .../catalog/test_fixtures/catalog_rhel.json   | 4737 -----------------
 1 file changed, 4737 deletions(-)
 delete mode 100644 build_stream/core/catalog/test_fixtures/catalog_rhel.json

diff --git a/build_stream/core/catalog/test_fixtures/catalog_rhel.json b/build_stream/core/catalog/test_fixtures/catalog_rhel.json
deleted file mode 100644
index 5f931163de..0000000000
--- a/build_stream/core/catalog/test_fixtures/catalog_rhel.json
+++ /dev/null
@@ -1,4737 +0,0 @@
-{
-  "Catalog": {
-    "Name": "Catalog",
-    "Version": "1.0",
-    "Identifier": "image-build",
-    "FunctionalLayer": [
-      {
-        "Name": "login_compiler_node_aarch64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_16",
-          "package_id_17",
-          "package_id_18",
-          "package_id_19",
-          "package_id_20",
-          "package_id_22",
-          "package_id_27",
-          "package_id_32",
-          "package_id_5",
-          "package_id_6",
-          "package_id_7",
-          "package_id_8",
-          "package_id_9"
-        ]
-      },
-      {
-        "Name": "login_node_x86_64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_16",
-          "package_id_17",
-          "package_id_18",
-          "package_id_19",
-          "package_id_20",
-          "package_id_21",
-          "package_id_22",
-          "package_id_27",
-          "package_id_32",
-          "package_id_5",
-          "package_id_6",
-          "package_id_7",
-          "package_id_8",
-          "package_id_9"
-        ]
-      },
-      {
-        "Name": "os_aarch64",
-        "FunctionalPackages": [
-          "package_id_1",
-          "package_id_2",
-          "package_id_3",
-          "package_id_4"
-        ]
-      },
-      {
-        "Name": "os_x86_64",
-        "FunctionalPackages": [
-          "package_id_1",
-          "package_id_2",
-          "package_id_3",
-          "package_id_4"
-        ]
-      },
-      {
-        "Name": "service_kube_control_plane_x86_64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_33",
-          "package_id_34",
-          "package_id_35",
-          "package_id_36",
-          "package_id_37",
-          "package_id_38",
-          "package_id_39",
-          "package_id_40",
-          "package_id_41",
-          "package_id_42",
-          "package_id_43",
-          "package_id_44",
-          "package_id_45",
-          "package_id_46",
-          "package_id_47",
-          "package_id_48",
-          "package_id_49",
-          "package_id_50",
-          "package_id_51",
-          "package_id_52",
-          "package_id_53",
-          "package_id_54",
-          "package_id_55",
-          "package_id_56",
-          "package_id_57",
-          "package_id_58",
-          "package_id_59",
-          "package_id_6",
-          "package_id_60",
-          "package_id_61",
-          "package_id_62",
-          "package_id_63",
-          "package_id_64",
-          "package_id_65",
-          "package_id_66",
-          "package_id_67",
-          "package_id_68",
-          "package_id_69",
-          "package_id_7",
-          "package_id_70",
-          "package_id_71",
-          "package_id_72",
-          "package_id_73",
-          "package_id_74",
-          "package_id_75",
-          "package_id_76",
-          "package_id_77",
-          "package_id_78",
-          "package_id_79",
-          "package_id_80",
-          "package_id_81",
-          "package_id_82",
-          "package_id_83",
-          "package_id_84",
-          "package_id_85",
-          "package_id_86",
-          "package_id_87",
-          "package_id_88",
-          "package_id_89",
-          "package_id_90",
-          "package_id_91",
-          "package_id_92",
-          "package_id_93",
-          "package_id_94",
-          "package_id_95",
-          "package_id_96",
-          "package_id_97"
-        ]
-      },
-      {
-        "Name": "service_kube_node_x86_64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_33",
-          "package_id_34",
-          "package_id_35",
-          "package_id_36",
-          "package_id_37",
-          "package_id_38",
-          "package_id_39",
-          "package_id_40",
-          "package_id_41",
-          "package_id_42",
-          "package_id_43",
-          "package_id_44",
-          "package_id_45",
-          "package_id_46",
-          "package_id_47",
-          "package_id_48",
-          "package_id_49",
-          "package_id_50",
-          "package_id_51",
-          "package_id_52",
-          "package_id_53",
-          "package_id_54",
-          "package_id_55",
-          "package_id_56",
-          "package_id_57",
-          "package_id_58",
-          "package_id_59",
-          "package_id_6",
-          "package_id_60",
-          "package_id_61",
-          "package_id_62",
-          "package_id_63",
-          "package_id_64",
-          "package_id_65",
-          "package_id_66",
-          "package_id_67",
-          "package_id_68",
-          "package_id_69",
-          "package_id_7",
-          "package_id_70",
-          "package_id_71",
-          "package_id_72",
-          "package_id_73",
-          "package_id_74",
-          "package_id_75",
-          "package_id_76",
-          "package_id_77",
-          "package_id_89",
-          "package_id_98",
-          "package_id_99"
-        ]
-      },
-      {
-        "Name": "slurm_control_node_x86_64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_16",
-          "package_id_17",
-          "package_id_18",
-          "package_id_19",
-          "package_id_20",
-          "package_id_21",
-          "package_id_22",
-          "package_id_23",
-          "package_id_24",
-          "package_id_25",
-          "package_id_26",
-          "package_id_5",
-          "package_id_6",
-          "package_id_7",
-          "package_id_8",
-          "package_id_9"
-        ]
-      },
-      {
-        "Name": "slurm_node_aarch64",
-        "FunctionalPackages": [
-          "package_id_10",
-          "package_id_100",
-          "package_id_11",
-          "package_id_12",
-          "package_id_13",
-          "package_id_14",
-          "package_id_15",
-          "package_id_16",
-          "package_id_17",
-          "package_id_18",
-          "package_id_19",
-          "package_id_20",
-          "package_id_22",
-          "package_id_27",
-          "package_id_28",
-          "package_id_29",
-          "package_id_30",
-          "package_id_5",
-          "package_id_6",
-          "package_id_7",
-          "package_id_8",
-          "package_id_9"
-        ]
-      }
-    ],
-    "BaseOS": [
-      {
-        "Name": "RHEL",
-        "Version": "10.0",
-        "osPackages": [
-          "os_package_id_1",
-          "os_package_id_10",
-          "os_package_id_11",
-          "os_package_id_12",
-          "os_package_id_13",
-          "os_package_id_14",
-          "os_package_id_15",
-          "os_package_id_16",
-          "os_package_id_17",
-          "os_package_id_18",
-          "os_package_id_19",
-          "os_package_id_2",
-          "os_package_id_20",
-          "os_package_id_21",
-          "os_package_id_22",
-          "os_package_id_23",
-          "os_package_id_24",
-          "os_package_id_25",
-          "os_package_id_26",
-          "os_package_id_27",
-          "os_package_id_28",
-          "os_package_id_29",
-          "os_package_id_3",
-          "os_package_id_30",
-          "os_package_id_31",
-          "os_package_id_32",
-          "os_package_id_33",
-          "os_package_id_34",
-          "os_package_id_35",
-          "os_package_id_36",
-          "os_package_id_37",
-          "os_package_id_38",
-          "os_package_id_39",
-          "os_package_id_4",
-          "os_package_id_40",
-          "os_package_id_41",
-          "os_package_id_42",
-          "os_package_id_43",
-          "os_package_id_44",
-          "os_package_id_45",
-          "os_package_id_46",
-          "os_package_id_47",
-          "os_package_id_48",
-          "os_package_id_49",
-          "os_package_id_5",
-          "os_package_id_50",
-          "os_package_id_51",
-          "os_package_id_52",
-          "os_package_id_53",
-          "os_package_id_54",
-          "os_package_id_55",
-          "os_package_id_56",
-          "os_package_id_57",
-          "os_package_id_58",
-          "os_package_id_59",
-          "os_package_id_6",
-          "os_package_id_60",
-          "os_package_id_61",
-          "os_package_id_62",
-          "os_package_id_63",
-          "os_package_id_64",
-          "os_package_id_65",
-          "os_package_id_66",
-          "os_package_id_67",
-          "os_package_id_68",
-          "os_package_id_69",
-          "os_package_id_7",
-          "os_package_id_70",
-          "os_package_id_71",
-          "os_package_id_72",
-          "os_package_id_73",
-          "os_package_id_74",
-          "os_package_id_75",
-          "os_package_id_76",
-          "os_package_id_77",
-          "os_package_id_78",
-          "os_package_id_79",
-          "os_package_id_8",
-          "os_package_id_80",
-          "os_package_id_81",
-          "os_package_id_82",
-          "os_package_id_83",
-          "os_package_id_84",
-          "os_package_id_85",
-          "os_package_id_86",
-          "os_package_id_87",
-          "os_package_id_88",
-          "os_package_id_89",
-          "os_package_id_9",
-          "os_package_id_90",
-          "os_package_id_91",
-          "os_package_id_92",
-          "os_package_id_93",
-          "os_package_id_94",
-          "os_package_id_95"
-        ]
-      }
-    ],
-    "Infrastructure": [
-      {
-        "Name": "csi",
-        "InfrastructurePackages": [
-          "infrastructure_package_id_1",
-          "infrastructure_package_id_10",
-          "infrastructure_package_id_11",
-          "infrastructure_package_id_12",
-          "infrastructure_package_id_13",
-          "infrastructure_package_id_14",
-          "infrastructure_package_id_15",
-          "infrastructure_package_id_16",
-          "infrastructure_package_id_2",
-          "infrastructure_package_id_3",
-          "infrastructure_package_id_4",
-          "infrastructure_package_id_5",
-          "infrastructure_package_id_6",
-          "infrastructure_package_id_7",
-          "infrastructure_package_id_8",
-          "infrastructure_package_id_9"
-        ]
-      }
-    ],
-    "Drivers": [],
-    "DriverPackages": {},
-    "FunctionalPackages": {
-      "package_id_1": {
-        "Name": "python3-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_2": {
-        "Name": "python3-cython",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "codeready-builder"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "codeready-builder"
-          }
-        ]
-      },
-      "package_id_3": {
-        "Name": "openssl-libs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_4": {
-        "Name": "ovis-ldms",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "ldms"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "ldms"
-          }
-        ]
-      },
-      "package_id_5": {
-        "Name": "munge",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_6": {
-        "Name": "firewalld",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_7": {
-        "Name": "python3-firewall",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_8": {
-        "Name": "pmix",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_9": {
-        "Name": "nvcr.io/nvidia/hpc-benchmarks",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "25.09",
-        "Version": "25.09"
-      },
-      "package_id_10": {
-        "Name": "apptainer",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "epel"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "epel"
-          }
-        ]
-      },
-      "package_id_11": {
-        "Name": "doca-ofed",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm_repo",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "doca"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "doca"
-          }
-        ]
-      },
-      "package_id_12": {
-        "Name": "iscsi-initiator-utils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_13": {
-        "Name": "device-mapper-multipath",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_14": {
-        "Name": "sg3_utils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_15": {
-        "Name": "lsscsi",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_16": {
-        "Name": "imb",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://github.com/intel/mpi-benchmarks/archive/refs/tags/IMB-v2021.8.tar.gz"
-          }
-        ]
-      },
-      "package_id_17": {
-        "Name": "osu-micro-benchmarks",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.tar.gz"
-          }
-        ]
-      },
-      "package_id_18": {
-        "Name": "likwid",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://github.com/RRZE-HPC/likwid/archive/refs/tags/v5.4.1.tar.gz"
-          }
-        ]
-      },
-      "package_id_19": {
-        "Name": "geopm",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://github.com/geopm/geopm/archive/refs/tags/v3.1.0.tar.gz"
-          }
-        ]
-      },
-      "package_id_20": {
-        "Name": "papi",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://github.com/icl-utk-edu/papi/releases/download/papi-7-2-0-t/papi-7.2.0.tar.gz"
-          }
-        ]
-      },
-      "package_id_21": {
-        "Name": "msr-safe",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/llnl/msr-safe/archive/refs/tags/v1.7.0.tar.gz"
-          }
-        ]
-      },
-      "package_id_22": {
-        "Name": "sionlib",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
-          },
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7"
-          }
-        ]
-      },
-      "package_id_23": {
-        "Name": "slurm-slurmctld",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "slurm_custom"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "slurm_custom"
-          }
-        ]
-      },
-      "package_id_24": {
-        "Name": "slurm-slurmdbd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "slurm_custom"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "slurm_custom"
-          }
-        ]
-      },
-      "package_id_25": {
-        "Name": "python3-PyMySQL",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_26": {
-        "Name": "mariadb-server",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_27": {
-        "Name": "slurm-slurmd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "slurm_custom"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "slurm_custom"
-          }
-        ]
-      },
-      "package_id_28": {
-        "Name": "slurm-pam_slurm",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "slurm_custom"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "slurm_custom"
-          }
-        ]
-      },
-      "package_id_29": {
-        "Name": "kernel-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_30": {
-        "Name": "kernel-headers",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_31": {
-        "Name": "nvhpc_2025_2511_Linux_x86_64_cuda_13.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://developer.download.nvidia.com/hpc-sdk/25.11/nvhpc_2025_2511_Linux_x86_64_cuda_13.0.tar.gz"
-          }
-        ]
-      },
-      "package_id_32": {
-        "Name": "slurm",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "slurm_custom"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "slurm_custom"
-          }
-        ]
-      },
-      "package_id_33": {
-        "Name": "vim-enhanced",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_34": {
-        "Name": "docker.io/library/busybox",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.36",
-        "Version": "1.36"
-      },
-      "package_id_35": {
-        "Name": "git",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_36": {
-        "Name": "fuse-overlayfs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_37": {
-        "Name": "podman",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_38": {
-        "Name": "kubeadm-1.35.1",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "kubernetes-v1-35"
-          }
-        ]
-      },
-      "package_id_39": {
-        "Name": "kubelet-1.35.1",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "kubernetes-v1-35"
-          }
-        ]
-      },
-      "package_id_40": {
-        "Name": "container-selinux",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "package_id_41": {
-        "Name": "cri-o-1.35.1",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "cri-o-v1-35"
-          }
-        ]
-      },
-      "package_id_42": {
-        "Name": "docker.io/victoriametrics/victoria-metrics",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.128.0",
-        "Version": "v1.128.0"
-      },
-      "package_id_43": {
-        "Name": "docker.io/victoriametrics/vmagent",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.128.0",
-        "Version": "v1.128.0"
-      },
-      "package_id_44": {
-        "Name": "docker.io/victoriametrics/vmstorage",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.128.0-cluster",
-        "Version": "v1.128.0-cluster"
-      },
-      "package_id_45": {
-        "Name": "docker.io/victoriametrics/vminsert",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.128.0-cluster",
-        "Version": "v1.128.0-cluster"
-      },
-      "package_id_46": {
-        "Name": "docker.io/victoriametrics/vmselect",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.128.0-cluster",
-        "Version": "v1.128.0-cluster"
-      },
-      "package_id_47": {
-        "Name": "docker.io/victoriametrics/victoria-logs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.50.0",
-        "Version": "v1.50.0"
-      },
-      "package_id_48": {
-        "Name": "docker.io/victoriametrics/vlagent",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.50.0",
-        "Version": "v1.50.0"
-      },
-      "package_id_49": {
-        "Name": "docker.io/alpine/kubectl",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.35.1",
-        "Version": "1.35.1"
-      },
-      "package_id_50": {
-        "Name": "docker.io/curlimages/curl",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "8.17.0",
-        "Version": "8.17.0"
-      },
-      "package_id_51": {
-        "Name": "docker.io/rmohr/activemq",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "5.15.9",
-        "Version": "5.15.9"
-      },
-      "package_id_52": {
-        "Name": "docker.io/library/mysql",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "9.3.0",
-        "Version": "9.3.0"
-      },
-      "package_id_53": {
-        "Name": "docker.io/library/python",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "3.12-slim",
-        "Version": "3.12-slim"
-      },
-      "package_id_54": {
-        "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.2",
-        "Version": "1.2"
-      },
-      "package_id_55": {
-        "Name": "docker.io/dellhpcomniaaisolution/kafkapump",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.2",
-        "Version": "1.2"
-      },
-      "package_id_56": {
-        "Name": "docker.io/dellhpcomniaaisolution/victoriapump",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.2",
-        "Version": "1.2"
-      },
-      "package_id_57": {
-        "Name": "cryptography==45.0.7",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_58": {
-        "Name": "omsdk==1.2.518",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_59": {
-        "Name": "cffi==1.17.1",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_60": {
-        "Name": "prometheus_client==0.20.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_61": {
-        "Name": "kubernetes==33.1.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_62": {
-        "Name": "quay.io/strimzi/operator",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "0.48.0",
-        "Version": "0.48.0"
-      },
-      "package_id_63": {
-        "Name": "quay.io/strimzi/kafka",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "0.48.0-kafka-4.1.0",
-        "Version": "0.48.0-kafka-4.1.0"
-      },
-      "package_id_64": {
-        "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.1",
-        "Version": "1.1"
-      },
-      "package_id_65": {
-        "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "0.143.1",
-        "Version": "0.143.1"
-      },
-      "package_id_66": {
-        "Name": "docker.io/nginxinc/nginx-unprivileged",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.29",
-        "Version": "1.29"
-      },
-      "package_id_67": {
-        "Name": "karavi-observability",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "git",
-        "Version": "v1.12.0"
-      },
-      "package_id_68": {
-        "Name": "quay.io/jetstack/cert-manager-controller",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.10.0",
-        "Version": "v1.10.0"
-      },
-      "package_id_69": {
-        "Name": "quay.io/jetstack/cert-manager-cainjector",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.10.0",
-        "Version": "v1.10.0"
-      },
-      "package_id_70": {
-        "Name": "quay.io/jetstack/cert-manager-webhook",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.10.0",
-        "Version": "v1.10.0"
-      },
-      "package_id_71": {
-        "Name": "quay.io/jetstack/cert-manager-acmesolver",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.10.0",
-        "Version": "v1.10.0"
-      },
-      "package_id_72": {
-        "Name": "cert-manager-v1.10.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz"
-          }
-        ]
-      },
-      "package_id_73": {
-        "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz"
-          }
-        ]
-      },
-      "package_id_74": {
-        "Name": "quay.io/strimzi/kafka-bridge",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "0.33.1",
-        "Version": "0.33.1"
-      },
-      "package_id_75": {
-        "Name": "docker.io/victoriametrics/operator",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "config-reloader-v0.68.3",
-        "Version": "config-reloader-v0.68.3"
-      },
-      "package_id_76": {
-        "Name": "victoria-metrics-operator-0.59.3",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz"
-          }
-        ]
-      },
-      "package_id_77": {
-        "Name": "docker.io/timberio/vector",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "0.54.0-debian",
-        "Version": "0.54.0-debian"
-      },
-      "package_id_78": {
-        "Name": "ghcr.io/kube-vip/kube-vip",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v0.8.9",
-        "Version": "v0.8.9"
-      },
-      "package_id_79": {
-        "Name": "registry.k8s.io/kube-apiserver",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.35.1",
-        "Version": "v1.35.1"
-      },
-      "package_id_80": {
-        "Name": "registry.k8s.io/kube-controller-manager",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.35.1",
-        "Version": "v1.35.1"
-      },
-      "package_id_81": {
-        "Name": "registry.k8s.io/kube-scheduler",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.35.1",
-        "Version": "v1.35.1"
-      },
-      "package_id_82": {
-        "Name": "registry.k8s.io/kube-proxy",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.35.1",
-        "Version": "v1.35.1"
-      },
-      "package_id_83": {
-        "Name": "registry.k8s.io/coredns/coredns",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v1.13.1",
-        "Version": "v1.13.1"
-      },
-      "package_id_84": {
-        "Name": "registry.k8s.io/pause",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "3.10.1",
-        "Version": "3.10.1"
-      },
-      "package_id_85": {
-        "Name": "registry.k8s.io/etcd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "3.6.6-0",
-        "Version": "3.6.6-0"
-      },
-      "package_id_86": {
-        "Name": "docker.io/calico/cni",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v3.31.4",
-        "Version": "v3.31.4"
-      },
-      "package_id_87": {
-        "Name": "docker.io/calico/kube-controllers",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v3.31.4",
-        "Version": "v3.31.4"
-      },
-      "package_id_88": {
-        "Name": "docker.io/calico/node",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v3.31.4",
-        "Version": "v3.31.4"
-      },
-      "package_id_89": {
-        "Name": "quay.io/metallb/speaker",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v0.15.3",
-        "Version": "v0.15.3"
-      },
-      "package_id_90": {
-        "Name": "kubectl-1.35.1",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "kubernetes-v1-35"
-          }
-        ]
-      },
-      "package_id_91": {
-        "Name": "prettytable==3.14.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_92": {
-        "Name": "python3-3.12.9",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "package_id_93": {
-        "Name": "PyMySQL==1.1.2",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "pip_module"
-      },
-      "package_id_94": {
-        "Name": "calico-v3.31.4",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "manifest",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://raw.githubusercontent.com/projectcalico/calico/v3.31.4/manifests/calico.yaml"
-          }
-        ]
-      },
-      "package_id_95": {
-        "Name": "metallb-native-v0.15.3",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "manifest",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml"
-          }
-        ]
-      },
-      "package_id_96": {
-        "Name": "helm-v3.20.1-amd64",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz"
-          }
-        ]
-      },
-      "package_id_97": {
-        "Name": "nfs-subdir-external-provisioner-4.0.18",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/releases/download/nfs-subdir-external-provisioner-4.0.18/nfs-subdir-external-provisioner-4.0.18.tgz"
-          }
-        ]
-      },
-      "package_id_98": {
-        "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v4.0.2",
-        "Version": "v4.0.2"
-      },
-      "package_id_99": {
-        "Name": "quay.io/metallb/controller",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "v0.15.3",
-        "Version": "v0.15.3"
-      },
-      "package_id_100": {
-        "Name": "nvhpc_2025_2511_Linux_aarch64_cuda_13.0",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64"
-        ],
-        "Type": "tarball",
-        "Sources": [
-          {
-            "Architecture": "aarch64",
-            "Uri": "https://developer.download.nvidia.com/hpc-sdk/25.11/nvhpc_2025_2511_Linux_aarch64_cuda_13.0.tar.gz"
-          }
-        ]
-      }
-    },
-    "OSPackages": {
-      "os_package_id_1": {
-        "Name": "python3-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_2": {
-        "Name": "python3-cython",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "codeready-builder"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "codeready-builder"
-          }
-        ]
-      },
-      "os_package_id_3": {
-        "Name": "openssl-libs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_4": {
-        "Name": "ovis-ldms",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "ldms"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "ldms"
-          }
-        ]
-      },
-      "os_package_id_5": {
-        "Name": "openldap-clients",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_6": {
-        "Name": "nss-pam-ldapd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "epel"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "epel"
-          }
-        ]
-      },
-      "os_package_id_7": {
-        "Name": "sssd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_8": {
-        "Name": "oddjob-mkhomedir",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_9": {
-        "Name": "authselect",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_10": {
-        "Name": "systemd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_11": {
-        "Name": "systemd-udev",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_12": {
-        "Name": "kernel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_13": {
-        "Name": "dracut",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_14": {
-        "Name": "dracut-live",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_15": {
-        "Name": "dracut-network",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_16": {
-        "Name": "squashfs-tools",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_17": {
-        "Name": "nfs-utils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_18": {
-        "Name": "nfs4-acl-tools",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_19": {
-        "Name": "NetworkManager",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_20": {
-        "Name": "nm-connection-editor",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_21": {
-        "Name": "iproute",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_22": {
-        "Name": "iputils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_23": {
-        "Name": "curl",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_24": {
-        "Name": "bash",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_25": {
-        "Name": "coreutils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_26": {
-        "Name": "grep",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_27": {
-        "Name": "sed",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_28": {
-        "Name": "gawk",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_29": {
-        "Name": "findutils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_30": {
-        "Name": "util-linux",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_31": {
-        "Name": "kbd",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_32": {
-        "Name": "lsof",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_33": {
-        "Name": "cryptsetup",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_34": {
-        "Name": "lvm2",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_35": {
-        "Name": "device-mapper",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_36": {
-        "Name": "rsyslog",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_37": {
-        "Name": "chrony",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_38": {
-        "Name": "sudo",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_39": {
-        "Name": "gzip",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_40": {
-        "Name": "wget",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_41": {
-        "Name": "cloud-init",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_42": {
-        "Name": "glibc-langpack-en",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_43": {
-        "Name": "gedit",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "epel"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "epel"
-          }
-        ]
-      },
-      "os_package_id_44": {
-        "Name": "docker.io/dellhpcomniaaisolution/image-build-el10",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Type": "image",
-        "Tag": "1.2",
-        "Version": "1.2"
-      },
-      "os_package_id_45": {
-        "Name": "which",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_46": {
-        "Name": "tcpdump",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_47": {
-        "Name": "traceroute",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_48": {
-        "Name": "iperf3",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_49": {
-        "Name": "fping",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "epel"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "epel"
-          }
-        ]
-      },
-      "os_package_id_50": {
-        "Name": "dmidecode",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_51": {
-        "Name": "hwloc",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_52": {
-        "Name": "hwloc-libs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_53": {
-        "Name": "lshw",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_54": {
-        "Name": "pciutils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_55": {
-        "Name": "emacs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_56": {
-        "Name": "zsh",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_57": {
-        "Name": "openssh",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_58": {
-        "Name": "openssh-server",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_59": {
-        "Name": "openssh-clients",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_60": {
-        "Name": "rsync",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_61": {
-        "Name": "file",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_62": {
-        "Name": "libcurl",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_63": {
-        "Name": "tar",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_64": {
-        "Name": "bzip2",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_65": {
-        "Name": "man-db",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_66": {
-        "Name": "man-pages",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_67": {
-        "Name": "strace",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_68": {
-        "Name": "kexec-tools",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_69": {
-        "Name": "openssl-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_70": {
-        "Name": "ipmitool",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_71": {
-        "Name": "gdb",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_72": {
-        "Name": "gdb-gdbserver",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_73": {
-        "Name": "lldb",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_74": {
-        "Name": "lldb-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_75": {
-        "Name": "valgrind",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_76": {
-        "Name": "valgrind-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_77": {
-        "Name": "ltrace",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_78": {
-        "Name": "kernel-tools",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_79": {
-        "Name": "perf",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_80": {
-        "Name": "papi",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_81": {
-        "Name": "papi-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_82": {
-        "Name": "papi-libs",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_83": {
-        "Name": "cmake",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_84": {
-        "Name": "make",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_85": {
-        "Name": "autoconf",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_86": {
-        "Name": "automake",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_87": {
-        "Name": "libtool",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_88": {
-        "Name": "gcc",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_89": {
-        "Name": "gcc-c++",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_90": {
-        "Name": "gcc-gfortran",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_91": {
-        "Name": "binutils",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_92": {
-        "Name": "binutils-devel",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "appstream"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "appstream"
-          }
-        ]
-      },
-      "os_package_id_93": {
-        "Name": "clustershell",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "epel"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "epel"
-          }
-        ]
-      },
-      "os_package_id_94": {
-        "Name": "bash-completion",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64",
-          "x86_64"
-        ],
-        "Type": "rpm",
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "RepoName": "baseos"
-          },
-          {
-            "Architecture": "aarch64",
-            "RepoName": "baseos"
-          }
-        ]
-      },
-      "os_package_id_95": {
-        "Name": "docker.io/dellhpcomniaaisolution/image-build-aarch64",
-        "SupportedOS": [
-          {
-            "Name": "RHEL",
-            "Version": "10.0"
-          }
-        ],
-        "Architecture": [
-          "aarch64"
-        ],
-        "Type": "image",
-        "Tag": "1.2",
-        "Version": "1.2"
-      }
-    },
-    "Miscellaneous": [],
-    "InfrastructurePackages": {
-      "infrastructure_package_id_1": {
-        "Name": "csi-powerscale",
-        "Type": "git",
-        "Version": "v2.16.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/dell/csi-powerscale.git"
-          }
-        ]
-      },
-      "infrastructure_package_id_2": {
-        "Name": "external-snapshotter",
-        "Type": "git",
-        "Version": "v8.4.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/kubernetes-csi/external-snapshotter.git"
-          }
-        ]
-      },
-      "infrastructure_package_id_3": {
-        "Name": "helm-charts",
-        "Type": "git",
-        "Version": "container-storage-modules-1.9.2",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Sources": [
-          {
-            "Architecture": "x86_64",
-            "Uri": "https://github.com/dell/helm-charts.git"
-          }
-        ]
-      },
-      "infrastructure_package_id_4": {
-        "Name": "quay.io/dell/container-storage-modules/csi-isilon",
-        "Type": "image",
-        "Version": "v2.16.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v2.16.0"
-      },
-      "infrastructure_package_id_5": {
-        "Name": "registry.k8s.io/sig-storage/csi-attacher",
-        "Type": "image",
-        "Version": "v4.10.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v4.10.0"
-      },
-      "infrastructure_package_id_6": {
-        "Name": "registry.k8s.io/sig-storage/csi-provisioner",
-        "Type": "image",
-        "Version": "v6.1.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v6.1.0"
-      },
-      "infrastructure_package_id_7": {
-        "Name": "registry.k8s.io/sig-storage/csi-snapshotter",
-        "Type": "image",
-        "Version": "v8.4.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v8.4.0"
-      },
-      "infrastructure_package_id_8": {
-        "Name": "registry.k8s.io/sig-storage/csi-resizer",
-        "Type": "image",
-        "Version": "v2.0.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v2.0.0"
-      },
-      "infrastructure_package_id_9": {
-        "Name": "registry.k8s.io/sig-storage/csi-node-driver-registrar",
-        "Type": "image",
-        "Version": "v2.15.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v2.15.0"
-      },
-      "infrastructure_package_id_10": {
-        "Name": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller",
-        "Type": "image",
-        "Version": "v0.16.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v0.16.0"
-      },
-      "infrastructure_package_id_11": {
-        "Name": "quay.io/dell/container-storage-modules/dell-csi-replicator",
-        "Type": "image",
-        "Version": "v1.14.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v1.14.0"
-      },
-      "infrastructure_package_id_12": {
-        "Name": "quay.io/dell/container-storage-modules/podmon",
-        "Type": "image",
-        "Version": "v1.15.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v1.15.0"
-      },
-      "infrastructure_package_id_13": {
-        "Name": "quay.io/dell/container-storage-modules/csm-authorization-sidecar",
-        "Type": "image",
-        "Version": "v2.4.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v2.4.0"
-      },
-      "infrastructure_package_id_14": {
-        "Name": "quay.io/dell/container-storage-modules/csi-metadata-retriever",
-        "Type": "image",
-        "Version": "v1.13.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v1.13.0"
-      },
-      "infrastructure_package_id_15": {
-        "Name": "registry.k8s.io/sig-storage/snapshot-controller",
-        "Type": "image",
-        "Version": "v8.4.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v8.4.0"
-      },
-      "infrastructure_package_id_16": {
-        "Name": "docker.io/dellemc/csm-encryption",
-        "Type": "image",
-        "Version": "v0.6.0",
-        "SupportedFunctions": [
-          {
-            "Name": "csi"
-          }
-        ],
-        "Architecture": [
-          "x86_64"
-        ],
-        "Tag": "v0.6.0"
-      }
-    }
-  }
-}

From da74572e0c953706df8c6dfda1b49661ab901863 Mon Sep 17 00:00:00 2001
From: "balajikumaran.cs" <balajikumaran.cs@dellteam.com>
Date: Fri, 12 Jun 2026 15:15:22 +0530
Subject: [PATCH 14/16] fix: add PowerScale S3 cleanup to oim_cleanup and fix
 VictoriaMetrics victoria-pump deployment   (#4742)

* input_validation changes for the powerscale telemetry

* Update en_us_validation_msg.py

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Update en_us_validation_msg.py

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* Update en_us_validation_msg.py

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* s3_cmd and victoria_metrics changes

* Update cleanup_openchami.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

* lint fix

* Update cleanup_openchami.yml

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>

---------

Signed-off-by: balajikumaran.cs <balajikumaran.cs@dellteam.com>
---
 .../idrac_telemetry_statefulset.yaml.j2       |  2 +-
 .../tasks/cleanup_openchami.yml               | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/provision/roles/telemetry/templates/telemetry/idrac_telemetry/idrac_telemetry_statefulset.yaml.j2 b/provision/roles/telemetry/templates/telemetry/idrac_telemetry/idrac_telemetry_statefulset.yaml.j2
index 7d56e91d56..28d44cb0ea 100644
--- a/provision/roles/telemetry/templates/telemetry/idrac_telemetry/idrac_telemetry_statefulset.yaml.j2
+++ b/provision/roles/telemetry/templates/telemetry/idrac_telemetry/idrac_telemetry_statefulset.yaml.j2
@@ -227,7 +227,7 @@ spec:
               memory: {{ idrac_telemetry_resources.kafka_pump.limits.memory }}
 {% endif %}
 
-{% if 'victoria' in types %}
+{% if 'victoria_metrics' in types %}
         - name: victoria-pump
           image: {{ victoriapump_image }}
           imagePullPolicy: IfNotPresent
diff --git a/utils/roles/oim_cleanup/oim_container_cleanup/tasks/cleanup_openchami.yml b/utils/roles/oim_cleanup/oim_container_cleanup/tasks/cleanup_openchami.yml
index 6c9e219ce5..a054080265 100644
--- a/utils/roles/oim_cleanup/oim_container_cleanup/tasks/cleanup_openchami.yml
+++ b/utils/roles/oim_cleanup/oim_container_cleanup/tasks/cleanup_openchami.yml
@@ -13,6 +13,71 @@
 # limitations under the License.
 ---
 
+# S3 BUCKET CLEANUP (Must run BEFORE OpenCHAMI package removal)
+
+- name: Check if s3cmd is available
+  ansible.builtin.command: which s3cmd
+  register: s3cmd_check
+  changed_when: false
+  failed_when: false
+
+- name: List existing S3 buckets
+  ansible.builtin.command: s3cmd ls
+  register: s3_bucket_output
+  changed_when: false
+  failed_when: false
+  when: s3cmd_check.rc == 0
+
+- name: Remove all S3 boot-images contents
+  ansible.builtin.command: s3cmd del --recursive --force s3://boot-images/
+  register: s3_boot_cleanup
+  changed_when: s3_boot_cleanup.rc == 0
+  failed_when: false
+  when:
+    - s3cmd_check.rc == 0
+    - s3_bucket_output.stdout is defined
+    - "'s3://boot-images' in s3_bucket_output.stdout"
+
+- name: Remove S3 boot-images bucket
+  ansible.builtin.command: s3cmd rb s3://boot-images/
+  register: s3_boot_bucket_delete
+  changed_when: s3_boot_bucket_delete.rc == 0
+  failed_when: false
+  when:
+    - s3cmd_check.rc == 0
+    - s3_bucket_output.stdout is defined
+    - "'s3://boot-images' in s3_bucket_output.stdout"
+
+- name: Remove all S3 efi contents
+  ansible.builtin.command: s3cmd del --recursive --force s3://efi/
+  register: s3_efi_cleanup
+  changed_when: s3_efi_cleanup.rc == 0
+  failed_when: false
+  when:
+    - s3cmd_check.rc == 0
+    - s3_bucket_output.stdout is defined
+    - "'s3://efi' in s3_bucket_output.stdout"
+
+- name: Remove S3 efi bucket
+  ansible.builtin.command: s3cmd rb s3://efi/
+  register: s3_efi_bucket_delete
+  changed_when: s3_efi_bucket_delete.rc == 0
+  failed_when: false
+  when:
+    - s3cmd_check.rc == 0
+    - s3_bucket_output.stdout is defined
+    - "'s3://efi' in s3_bucket_output.stdout"
+
+- name: Display S3 cleanup result
+  ansible.builtin.debug:
+    msg: >-
+      S3 cleanup: boot-images={{ "deleted" if (s3_boot_bucket_delete.changed | default(false))
+      else "skipped" }}, efi={{ "deleted" if (s3_efi_bucket_delete.changed | default(false))
+      else "skipped" }}
+  when: s3cmd_check.rc == 0
+
+# OPENCHAMI PACKAGE AND SERVICE CLEANUP
+
 - name: Remove OpenChami packages
   ansible.builtin.dnf:
     name: "{{ openchami_packages }}"

From 6618f44eabc0f187d5c16e8770275fba2fcb58c5 Mon Sep 17 00:00:00 2001
From: priti-parate <140157516+priti-parate@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:33:24 +0530
Subject: [PATCH 15/16] Update service_k8s_v1.35.1.json (#4749)

update powerscale telemetry packages
---
 .../x86_64/rhel/10.0/service_k8s_v1.35.1.json      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json b/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json
index 1fc9bd65ef..af9476e8ea 100644
--- a/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json
+++ b/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json
@@ -35,11 +35,11 @@
       { "package": "quay.io/strimzi/operator", "tag": "0.48.0", "type": "image" },
       { "package": "quay.io/strimzi/kafka", "tag": "0.48.0-kafka-4.1.0", "type": "image" },
       { "package": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", "tag": "1.1", "type": "image" },
-      { "package": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", "tag": "v1.11.0", "type": "image" },
-      { "package": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", "tag": "0.143.1", "type": "image" },
+      { "package": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", "tag": "v1.12.0", "type": "image" },
+      { "package": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", "tag": "0.150.1", "type": "image" },
       { "package": "docker.io/nginxinc/nginx-unprivileged", "tag": "1.29", "type": "image" },
-      { "package": "karavi-observability", "type": "git", "url": "https://github.com/dell/karavi-observability.git", "version": "v1.12.0" },
-      { "package": "helm-charts", "type": "git", "url": "https://github.com/dell/helm-charts.git", "version": "container-storage-modules-1.9.2" },
+      { "package": "karavi-observability", "type": "git", "url": "https://github.com/dell/karavi-observability.git", "version": "v1.15.0" },
+      { "package": "helm-charts", "type": "git", "url": "https://github.com/dell/helm-charts.git", "version": "container-storage-modules-1.10.0" },
       { "package": "quay.io/jetstack/cert-manager-controller", "tag": "v1.10.0", "type": "image" },
       { "package": "quay.io/jetstack/cert-manager-cainjector", "tag": "v1.10.0", "type": "image" },
       { "package": "quay.io/jetstack/cert-manager-webhook", "tag": "v1.10.0", "type": "image" },
@@ -99,7 +99,7 @@
       { "package": "docker.io/calico/node", "tag": "v3.31.4", "type": "image" },
       { "package": "quay.io/metallb/speaker", "tag": "v0.15.3", "type": "image" },
       { "package": "calico-v3.31.4","type": "manifest", "url": "https://raw.githubusercontent.com/projectcalico/calico/v3.31.4/manifests/calico.yaml" },
-      { "package": "metallb-native-v0.15.3", "type": "manifest", "url": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" },     
+      { "package": "metallb-native-v0.15.3", "type": "manifest", "url": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" },
       { "package": "helm-v3.20.1-amd64", "type": "tarball", "url": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" },
       { "package": "nfs-subdir-external-provisioner-4.0.18", "type": "tarball", "url": "https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/releases/download/nfs-subdir-external-provisioner-4.0.18/nfs-subdir-external-provisioner-4.0.18.tgz" },
       { "package": "kubectl-1.35.1", "type": "rpm", "repo_name": "kubernetes-v1-35"},
@@ -115,7 +115,7 @@
     "cluster": [
       { "package": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", "tag": "v4.0.2", "type": "image" },
       { "package": "quay.io/metallb/speaker", "tag": "v0.15.3", "type": "image" },
-      { "package": "quay.io/metallb/controller", "tag": "v0.15.3", "type": "image" } 
+      { "package": "quay.io/metallb/controller", "tag": "v0.15.3", "type": "image" }
     ]
   }
-}
\ No newline at end of file
+}

From ece64417c0c57160d7ee1bd8bfa854716bc2ba57 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Fri, 12 Jun 2026 15:37:39 +0530
Subject: [PATCH 16/16] catalog powerscale update

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
---
 examples/catalog/catalog_rhel.json                   | 12 ++++++------
 .../catalog/catalog_rhel_with_nfs_provisioner.json   | 12 ++++++------
 examples/catalog/catalog_rhel_x86_64.json            | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/catalog/catalog_rhel.json b/examples/catalog/catalog_rhel.json
index 10f581d1bc..fa265ce93b 100644
--- a/examples/catalog/catalog_rhel.json
+++ b/examples/catalog/catalog_rhel.json
@@ -1036,8 +1036,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "0.143.1",
-        "Version": "0.143.1"
+        "Tag": "0.150.1",
+        "Version": "0.150.1"
       },
       "git": {
         "Name": "git",
@@ -1089,7 +1089,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "container-storage-modules-1.9.2",
+        "Version": "container-storage-modules-1.10.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1157,7 +1157,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "v1.12.0",
+        "Version": "v1.15.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1757,8 +1757,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "v1.11.0",
-        "Version": "v1.11.0"
+        "Tag": "v1.12.0",
+        "Version": "v1.12.0"
       },
       "quay.io/jetstack/cert-manager-acmesolver": {
         "Name": "quay.io/jetstack/cert-manager-acmesolver",
diff --git a/examples/catalog/catalog_rhel_with_nfs_provisioner.json b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
index 307d14bfd5..511d5d0a6c 100644
--- a/examples/catalog/catalog_rhel_with_nfs_provisioner.json
+++ b/examples/catalog/catalog_rhel_with_nfs_provisioner.json
@@ -1005,8 +1005,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "0.143.1",
-        "Version": "0.143.1"
+        "Tag": "0.150.1",
+        "Version": "0.150.1"
       },
       "git": {
         "Name": "git",
@@ -1058,7 +1058,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "container-storage-modules-1.9.2",
+        "Version": "container-storage-modules-1.10.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1126,7 +1126,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "v1.12.0",
+        "Version": "v1.15.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1630,8 +1630,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "v1.11.0",
-        "Version": "v1.11.0"
+        "Tag": "v1.12.0",
+        "Version": "v1.12.0"
       },
       "quay.io/jetstack/cert-manager-acmesolver": {
         "Name": "quay.io/jetstack/cert-manager-acmesolver",
diff --git a/examples/catalog/catalog_rhel_x86_64.json b/examples/catalog/catalog_rhel_x86_64.json
index 9a643429d3..a882551226 100644
--- a/examples/catalog/catalog_rhel_x86_64.json
+++ b/examples/catalog/catalog_rhel_x86_64.json
@@ -1012,8 +1012,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "0.143.1",
-        "Version": "0.143.1"
+        "Tag": "0.150.1",
+        "Version": "0.150.1"
       },
       "git": {
         "Name": "git",
@@ -1065,7 +1065,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "container-storage-modules-1.9.2",
+        "Version": "container-storage-modules-1.10.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1123,7 +1123,7 @@
           "x86_64"
         ],
         "Type": "git",
-        "Version": "v1.12.0",
+        "Version": "v1.15.0",
         "Sources": [
           {
             "Architecture": "x86_64",
@@ -1647,8 +1647,8 @@
           "x86_64"
         ],
         "Type": "image",
-        "Tag": "v1.11.0",
-        "Version": "v1.11.0"
+        "Tag": "v1.12.0",
+        "Version": "v1.12.0"
       },
       "quay.io/jetstack/cert-manager-acmesolver": {
         "Name": "quay.io/jetstack/cert-manager-acmesolver",