From 10e04ebe18890a010ab9661e15ed2d72ffd28339 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Thu, 8 Jan 2026 12:09:14 +0100
Subject: [PATCH 01/55] Update HyperConverged.yaml

Update HyperConverged.yaml #24 >> Correction of the structure - The correct indentation in the right place.
---
 isar-apps/ocp-v/HyperConverged.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/isar-apps/ocp-v/HyperConverged.yaml b/isar-apps/ocp-v/HyperConverged.yaml
index e25a518..486d269 100644
--- a/isar-apps/ocp-v/HyperConverged.yaml
+++ b/isar-apps/ocp-v/HyperConverged.yaml
@@ -7,6 +7,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "100"
 spec:
+  defaultCPUModel: IvyBridge-v2
   # https://github.com/stormshift/support/issues/248
   permittedHostDevices: 
     pciHostDevices:

From dcb16b4e8d76c446a204012f57029f471999a041 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:28:43 +0100
Subject: [PATCH 02/55] Create instancetypes

---
 isar-apps/ocp-v/instancetypes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 isar-apps/ocp-v/instancetypes

diff --git a/isar-apps/ocp-v/instancetypes b/isar-apps/ocp-v/instancetypes
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes
@@ -0,0 +1 @@
+

From c3503ada81462b89031855a6a353d779b40c5e6c Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:33:02 +0100
Subject: [PATCH 03/55] Delete isar-apps/ocp-v/instancetypes

---
 isar-apps/ocp-v/instancetypes | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 isar-apps/ocp-v/instancetypes

diff --git a/isar-apps/ocp-v/instancetypes b/isar-apps/ocp-v/instancetypes
deleted file mode 100644
index 8b13789..0000000
--- a/isar-apps/ocp-v/instancetypes
+++ /dev/null
@@ -1 +0,0 @@
-

From 50724dedc2749fd63810234538b4a392fc8548ab Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:33:33 +0100
Subject: [PATCH 04/55] Create README.md

---
 isar-apps/ocp-v/instancetypes/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/README.md

diff --git a/isar-apps/ocp-v/instancetypes/README.md b/isar-apps/ocp-v/instancetypes/README.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/README.md
@@ -0,0 +1 @@
+

From 62a14380b53672d87796e0e8d521197521b0bef8 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:33:58 +0100
Subject: [PATCH 05/55] Create README.md

---
 isar-apps/ocp-v/templates/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 isar-apps/ocp-v/templates/README.md

diff --git a/isar-apps/ocp-v/templates/README.md b/isar-apps/ocp-v/templates/README.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/isar-apps/ocp-v/templates/README.md
@@ -0,0 +1 @@
+

From 9d447fb5a4d03e66dbf7d6dc0b2ab00df0289e3b Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:39:58 +0100
Subject: [PATCH 06/55] Create rhel-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
@@ -0,0 +1 @@
+

From b48f3d534f179f066fca38dea0fc706781fdc099 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:40:22 +0100
Subject: [PATCH 07/55] Update rhel-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
index 8b13789..c38414f 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
@@ -1 +1,12 @@
-
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachineClusterInstancetype
+metadata:
+  name: rhel-hassel-instancetype
+spec:
+  cpu:
+    guest: 2
+    model: "Haswell-v4"
+  memory:
+    guest: "4Gi"
+  nodeSelector:
+    usage: "rhel9-hassel"

From 658bbcf7db1ffa5dad4db6fcd471bf22be124019 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:41:00 +0100
Subject: [PATCH 08/55] Create rhel9-ds-custom.yaml

---
 .../ocp-v/instancetypes/rhel9-ds-custom.yaml   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
new file mode 100644
index 0000000..8d34c23
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
@@ -0,0 +1,18 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataSource
+metadata:
+  name: rhel9-hassel
+  namespace: openshift-virtualization-os-images
+  annotations:
+    virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell/Ivy)"
+  labels:
+    app.kubernetes.io/component: storage
+    kubevirt.io/dynamic-credentials-support: "true"
+    os.template.kubevirt.io/rhel9: "true"
+    instancetype.kubevirt.io/default-instancetype: "rhel-hassel-instancetype"
+    instancetype.kubevirt.io/default-instancetype-kind: "VirtualMachineClusterInstancetype"
+spec:
+  source:
+    pvc:
+      name: rhel9-clean-base
+      namespace: openshift-virtualization-os-images

From 5e65b51a0bb16362e52c5c501e0e3412b274cae7 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:41:48 +0100
Subject: [PATCH 09/55] Create rhel9-dv-import.yaml

---
 .../ocp-v/instancetypes/rhel9-dv-import.yaml    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml b/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml
new file mode 100644
index 0000000..4ce0c76
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml
@@ -0,0 +1,17 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataVolume
+metadata:
+  name: rhel9-clean-base
+  namespace: openshift-virtualization-os-images
+spec:
+  source:
+    registry:
+      url: "docker://registry.redhat.io/rhel9/rhel-guest-image:latest"
+      secretRef: redhat-registry-credentials
+  storage:
+    storageClassName: coe-netapp-san 
+    accessModes:
+      - ReadWriteMany
+    resources:
+      requests:
+        storage: 30Gi

From 56869f083a556e2d87213cc85f60156ce90f8f32 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:42:10 +0100
Subject: [PATCH 10/55] Create rhel10-ds-custom.yaml

---
 .../ocp-v/instancetypes/rhel10-ds-custom.yaml  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
new file mode 100644
index 0000000..8c22a3c
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -0,0 +1,18 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataSource
+metadata:
+  name: rhel10-hassel
+  namespace: openshift-virtualization-os-images
+  annotations:
+    virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell/Ivy)"
+  labels:
+    app.kubernetes.io/component: storage
+    kubevirt.io/dynamic-credentials-support: "true"
+    os.template.kubevirt.io/rhel9: "true"
+    instancetype.kubevirt.io/default-instancetype: rhel-hassel-instancetype
+    instancetype.kubevirt.io/default-instancetype-kind: VirtualMachineClusterInstancetype
+spec:
+  source:
+    pvc:
+      name: rhel10-clean-base
+      namespace: openshift-virtualization-os-images

From 868568c1e212d4c225cb041bc89029e81239dbaa Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:42:34 +0100
Subject: [PATCH 11/55] Create rhel10-dv-import.yaml

---
 .../ocp-v/instancetypes/rhel10-dv-import.yaml   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml b/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml
new file mode 100644
index 0000000..b7644de
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml
@@ -0,0 +1,17 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataVolume
+metadata:
+  name: rhel10-clean-base
+  namespace: openshift-virtualization-os-images
+spec:
+  source:
+    registry:
+      url: "docker://registry.redhat.io/rhel10/rhel-guest-image:latest"
+      secretRef: redhat-registry-credentials
+  storage:
+    storageClassName: coe-netapp-san 
+    accessModes:
+      - ReadWriteMany
+    resources:
+      requests:
+        storage: 30Gi

From 82103932b4d01aefe25a028fa9996fbae2b7ed81 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 11:43:00 +0100
Subject: [PATCH 12/55] Create secret-rhel.yaml

---
 isar-apps/ocp-v/instancetypes/secret-rhel.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/secret-rhel.yaml

diff --git a/isar-apps/ocp-v/instancetypes/secret-rhel.yaml b/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
new file mode 100644
index 0000000..0f27ae8
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: redhat-registry-credentials
+  namespace: openshift-virtualization-os-images
+type: Opaque
+data:
+  accessKeyId: d21hcng=
+  secretKey: T3JiaXQxMjMh

From baba93b77a7f37abfc5ae699df71cc91e9b9143a Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:05:01 +0100
Subject: [PATCH 13/55] Create rhel9-broadwell.yaml

---
 .../ocp-v/templates/rhel9-broadwell.yaml      | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 isar-apps/ocp-v/templates/rhel9-broadwell.yaml

diff --git a/isar-apps/ocp-v/templates/rhel9-broadwell.yaml b/isar-apps/ocp-v/templates/rhel9-broadwell.yaml
new file mode 100644
index 0000000..7521f81
--- /dev/null
+++ b/isar-apps/ocp-v/templates/rhel9-broadwell.yaml
@@ -0,0 +1,180 @@
+kind: Template
+apiVersion: template.openshift.io/v1
+metadata:
+  name: rhel9-broadwell
+  namespace: openshift
+  labels:
+    app.kubernetes.io/part-of: hyperconverged-cluster
+    template.kubevirt.io/architecture: amd64
+    template.kubevirt.io/version: v0.34.1
+    app.kubernetes.io/version: 4.20.3
+    template.kubevirt.io/type: vm
+    vm.kubevirt.io/template: rhel9-haswell
+    app.kubernetes.io/component: templating
+    app.kubernetes.io/managed-by: ssp-operator
+    flavor.template.kubevirt.io/medium: 'true'
+    os.template.kubevirt.io/rhel9.0: 'true'
+    os.template.kubevirt.io/rhel9.1: 'true'
+    app.kubernetes.io/name: custom-templates
+    os.template.kubevirt.io/rhel9.2: 'true'
+    os.template.kubevirt.io/rhel9.3: 'true'
+    os.template.kubevirt.io/rhel9.4: 'true'
+    vm.kubevirt.io/template.namespace: openshift
+    os.template.kubevirt.io/rhel9.5: 'true'
+    os.template.kubevirt.io/rhel9.6: 'true'
+    workload.template.kubevirt.io/server: 'true'
+    os.template.kubevirt.io/rhel9.7: 'true'
+  annotations:
+    template.kubevirt.io/provider: ''
+    template.kubevirt.io/provider-url: 'https://www.redhat.com'
+    template.kubevirt.io/containerdisks: |
+      registry.redhat.io/rhel9/rhel-guest-image
+    template.kubevirt.io/version: v1alpha1
+    openshift.io/display-name: Red Hat Enterprise Linux 9 - Broadwell
+    openshift.io/documentation-url: 'https://github.com/kubevirt/common-templates'
+    template.kubevirt.io/images: |
+      https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.0/x86_64/product-software
+    operator-sdk/primary-resource-type: SSP.ssp.kubevirt.io
+    defaults.template.kubevirt.io/disk: rootdisk
+    name.os.template.kubevirt.io/rhel9.0: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.1: Red Hat Enterprise Linux 9.0 or higher
+    template.kubevirt.io/editable: |
+      /objects[0].spec.template.spec.domain.cpu.sockets
+      /objects[0].spec.template.spec.domain.cpu.cores
+      /objects[0].spec.template.spec.domain.cpu.threads
+      /objects[0].spec.template.spec.domain.memory.guest
+      /objects[0].spec.template.spec.domain.devices.disks
+      /objects[0].spec.template.spec.volumes
+      /objects[0].spec.template.spec.networks
+    name.os.template.kubevirt.io/rhel9.2: Red Hat Enterprise Linux 9.0 or higher
+    template.openshift.io/bindable: 'false'
+    openshift.kubevirt.io/pronounceable-suffix-for-name-expression: 'true'
+    operator-sdk/primary-resource: openshift-cnv/ssp-kubevirt-hyperconverged
+    name.os.template.kubevirt.io/rhel9.3: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.4: Red Hat Enterprise Linux 9.0 or higher
+    tags: 'hidden,kubevirt,virtualmachine,linux,rhel'
+    name.os.template.kubevirt.io/rhel9.5: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.6: Red Hat Enterprise Linux 9.0 or higher
+    template.kubevirt.io/provider-support-level: Full
+    name.os.template.kubevirt.io/rhel9.7: Red Hat Enterprise Linux 9.0 or higher
+    description: Template for Red Hat Enterprise Linux 9 VM or newer. A PVC with the RHEL disk image must be available.
+    openshift.io/support-url: 'https://github.com/kubevirt/common-templates/issues'
+    iconClass: icon-rhel
+    openshift.io/provider-display-name: ''
+objects:
+  - apiVersion: kubevirt.io/v1
+    kind: VirtualMachine
+    metadata:
+      annotations:
+        vm.kubevirt.io/validations: |
+          [
+            {
+              "name": "minimal-required-memory",
+              "path": "jsonpath::.spec.domain.memory.guest",
+              "rule": "integer",
+              "message": "This VM requires more memory.",
+              "min": 1610612736
+            }
+          ]
+      labels:
+        app: '${NAME}'
+        kubevirt.io/dynamic-credentials-support: 'true'
+        vm.kubevirt.io/template: rhel9-broadwell
+        vm.kubevirt.io/template.revision: '1'
+        vm.kubevirt.io/template.namespace: openshift
+      name: '${NAME}'
+    spec:
+      dataVolumeTemplates:
+        - apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: '${NAME}'
+          spec:
+            sourceRef:
+              kind: DataSource
+              name: '${DATA_SOURCE_NAME}'
+              namespace: '${DATA_SOURCE_NAMESPACE}'
+            storage:
+              resources:
+                requests:
+                  storage: 30Gi
+      runStrategy: Halted
+      template:
+        metadata:
+          annotations:
+            vm.kubevirt.io/flavor: medium
+            vm.kubevirt.io/os: rhel9
+            vm.kubevirt.io/workload: server
+          labels:
+            kubevirt.io/domain: '${NAME}'
+            kubevirt.io/size: medium
+        spec:
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: kubernetes.io/hostname
+                        operator: In
+                        values:
+                          - storm5
+                          - storm6
+                    matchFields: []
+          architecture: amd64
+          domain:
+            cpu:
+              cores: 1
+              sockets: 1
+              threads: 1
+              model: Broadwell-v4
+            devices:
+              disks:
+                - disk:
+                    bus: virtio
+                  name: rootdisk
+                - disk:
+                    bus: virtio
+                  name: cloudinitdisk
+              interfaces:
+                - masquerade: {}
+                  model: virtio
+                  name: default
+              rng: {}
+            features:
+              smm:
+                enabled: true
+            firmware:
+              bootloader:
+                efi: {}
+            memory:
+              guest: 4Gi
+          networks:
+            - name: default
+              pod: {}
+          terminationGracePeriodSeconds: 180
+          volumes:
+            - dataVolume:
+                name: '${NAME}'
+              name: rootdisk
+            - cloudInitNoCloud:
+                userData: |-
+                  #cloud-config
+                  user: cloud-user
+                  password: ${CLOUD_USER_PASSWORD}
+                  chpasswd: { expire: False }
+              name: cloudinitdisk
+parameters:
+  - name: NAME
+    description: VM name
+    generate: expression
+    from: 'rhel9-[a-z0-9]{16}'
+  - name: DATA_SOURCE_NAME
+    description: Name of the DataSource to clone
+    value: rhel9
+  - name: DATA_SOURCE_NAMESPACE
+    description: Namespace of the DataSource
+    value: openshift-virtualization-os-images
+  - name: CLOUD_USER_PASSWORD
+    description: Randomized password for the cloud-init user cloud-user
+    generate: expression
+    from: '[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}'

From 261b30cfedbd7b83c8da6312d1970dfc8cdf6f6c Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:06:19 +0100
Subject: [PATCH 14/55] Create rhel9-haswellv4.yaml

---
 .../ocp-v/templates/rhel9-haswellv4.yaml      | 188 ++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100644 isar-apps/ocp-v/templates/rhel9-haswellv4.yaml

diff --git a/isar-apps/ocp-v/templates/rhel9-haswellv4.yaml b/isar-apps/ocp-v/templates/rhel9-haswellv4.yaml
new file mode 100644
index 0000000..290f326
--- /dev/null
+++ b/isar-apps/ocp-v/templates/rhel9-haswellv4.yaml
@@ -0,0 +1,188 @@
+kind: Template
+apiVersion: template.openshift.io/v1
+metadata:
+  name: rhel9-haswellv4
+  namespace: openshift
+  labels:
+    app.kubernetes.io/part-of: hyperconverged-cluster
+    template.kubevirt.io/architecture: amd64
+    template.kubevirt.io/version: v0.34.1
+    app.kubernetes.io/version: 4.20.3
+    template.kubevirt.io/type: vm
+    vm.kubevirt.io/template: rhel9-haswell
+    app.kubernetes.io/component: templating
+    app.kubernetes.io/managed-by: ssp-operator
+    flavor.template.kubevirt.io/medium: 'true'
+    os.template.kubevirt.io/rhel9.0: 'true'
+    os.template.kubevirt.io/rhel9.1: 'true'
+    template.kubevirt.io/default-os-variant: 'true'
+    app.kubernetes.io/name: custom-templates
+    os.template.kubevirt.io/rhel10.2: 'true'
+    os.template.kubevirt.io/rhel9.3: 'true'
+    os.template.kubevirt.io/rhel9.4: 'true'
+    vm.kubevirt.io/template.namespace: openshift
+    os.template.kubevirt.io/rhel9.5: 'true'
+    os.template.kubevirt.io/rhel9.6: 'true'
+    workload.template.kubevirt.io/server: 'true'
+    os.template.kubevirt.io/rhel9.7: 'true'
+  annotations:
+    template.kubevirt.io/provider: ''
+    template.kubevirt.io/provider-url: 'https://www.redhat.com'
+    template.kubevirt.io/containerdisks: |
+      registry.redhat.io/rhel9/rhel-guest-image
+    template.kubevirt.io/version: v1alpha1
+    openshift.io/display-name: Red Hat Enterprise Linux 9 (Haswell-v4)
+    openshift.io/documentation-url: 'https://github.com/kubevirt/common-templates'
+    template.kubevirt.io/images: |
+      https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.0/x86_64/product-software
+    operator-sdk/primary-resource-type: SSP.ssp.kubevirt.io
+    defaults.template.kubevirt.io/disk: rootdisk
+    name.os.template.kubevirt.io/rhel9.0: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.1: Red Hat Enterprise Linux 9.0 or higher
+    template.kubevirt.io/editable: |
+      /objects[0].spec.template.spec.domain.cpu.sockets
+      /objects[0].spec.template.spec.domain.cpu.cores
+      /objects[0].spec.template.spec.domain.cpu.threads
+      /objects[0].spec.template.spec.domain.memory.guest
+      /objects[0].spec.template.spec.domain.devices.disks
+      /objects[0].spec.template.spec.volumes
+      /objects[0].spec.template.spec.networks
+    name.os.template.kubevirt.io/rhel9.2: Red Hat Enterprise Linux 9.0 or higher
+    template.openshift.io/bindable: 'false'
+    openshift.kubevirt.io/pronounceable-suffix-for-name-expression: 'true'
+    operator-sdk/primary-resource: openshift-cnv/ssp-kubevirt-hyperconverged
+    name.os.template.kubevirt.io/rhel9.3: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.4: Red Hat Enterprise Linux 9.0 or higher
+    tags: 'hidden,kubevirt,virtualmachine,linux,rhel'
+    name.os.template.kubevirt.io/rhel9.5: Red Hat Enterprise Linux 9.0 or higher
+    name.os.template.kubevirt.io/rhel9.6: Red Hat Enterprise Linux 9.0 or higher
+    template.kubevirt.io/provider-support-level: Full
+    name.os.template.kubevirt.io/rhel9.7: Red Hat Enterprise Linux 9.0 or higher
+    description: Template for Red Hat Enterprise Linux 9 VM or newer. A PVC with the RHEL disk image must be available.
+    openshift.io/support-url: 'https://github.com/kubevirt/common-templates/issues'
+    iconClass: icon-rhel
+    openshift.io/provider-display-name: ''
+objects:
+  - apiVersion: kubevirt.io/v1
+    kind: VirtualMachine
+    metadata:
+      annotations:
+        vm.kubevirt.io/validations: |
+          [
+            {
+              "name": "minimal-required-memory",
+              "path": "jsonpath::.spec.domain.memory.guest",
+              "rule": "integer",
+              "message": "This VM requires more memory.",
+              "min": 1610612736
+            }
+          ]
+      labels:
+        app: '${NAME}'
+        kubevirt.io/dynamic-credentials-support: 'true'
+        vm.kubevirt.io/template: rhel9-haswellv4
+        vm.kubevirt.io/template.revision: '1'
+        vm.kubevirt.io/template.namespace: openshift
+        template.kubevirt.io/default-os-variant: 'true'
+      name: '${NAME}'
+    spec:
+      dataVolumeTemplates:
+        - apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: '${NAME}'
+          spec:
+            sourceRef:
+              kind: DataSource
+              name: '${DATA_SOURCE_NAME}'
+              namespace: '${DATA_SOURCE_NAMESPACE}'
+            storage:
+              resources:
+                requests:
+                  storage: 30Gi
+      runStrategy: Halted
+      template:
+        metadata:
+          annotations:
+            vm.kubevirt.io/flavor: medium
+            vm.kubevirt.io/os: rhel9
+            vm.kubevirt.io/workload: server
+          labels:
+            kubevirt.io/domain: '${NAME}'
+            kubevirt.io/size: medium
+        spec:
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: kubernetes.io/hostname
+                        operator: In
+                        values:
+                          - storm5
+                          - storm6
+                          - storm2
+                          - storm3
+                    matchFields: []
+          architecture: amd64
+          domain:
+            cpu:
+              cores: 1
+              sockets: 1
+              threads: 1
+              features:
+                - name: vmx-rdseed-exit
+                  policy: disable
+              model: Haswell-v4
+            devices:
+              disks:
+                - disk:
+                    bus: virtio
+                  name: rootdisk
+                - disk:
+                    bus: virtio
+                  name: cloudinitdisk
+              interfaces:
+                - masquerade: {}
+                  model: virtio
+                  name: default
+              rng: {}
+            features:
+              smm:
+                enabled: true
+            firmware:
+              bootloader:
+                efi: {}
+            memory:
+              guest: 4Gi
+          networks:
+            - name: default
+              pod: {}
+          terminationGracePeriodSeconds: 180
+          volumes:
+            - dataVolume:
+                name: '${NAME}'
+              name: rootdisk
+            - cloudInitNoCloud:
+                userData: |
+                  #cloud-config
+                  user: cloud-user
+                  password: redhat123
+                  chpasswd:
+                    expire: false
+              name: cloudinitdisk
+parameters:
+  - name: NAME
+    description: VM name
+    generate: expression
+    from: 'rhel9-[a-z0-9]{16}'
+  - name: DATA_SOURCE_NAME
+    description: Name of the DataSource to clone
+    value: rhel9
+  - name: DATA_SOURCE_NAMESPACE
+    description: Namespace of the DataSource
+    value: openshift-virtualization-os-images
+  - name: CLOUD_USER_PASSWORD
+    description: Randomized password for the cloud-init user cloud-user
+    generate: expression
+    from: '[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}'

From ddd39d2070dbaf5c0fd1bb4a552190e4c52e4e2f Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:06:58 +0100
Subject: [PATCH 15/55] Create rhel10-broadwell.yaml

---
 .../ocp-v/templates/rhel10-broadwell.yaml     | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 isar-apps/ocp-v/templates/rhel10-broadwell.yaml

diff --git a/isar-apps/ocp-v/templates/rhel10-broadwell.yaml b/isar-apps/ocp-v/templates/rhel10-broadwell.yaml
new file mode 100644
index 0000000..0eaa361
--- /dev/null
+++ b/isar-apps/ocp-v/templates/rhel10-broadwell.yaml
@@ -0,0 +1,104 @@
+kind: Template
+apiVersion: template.openshift.io/v1
+metadata:
+  name: rhel10-broadwell
+  namespace: openshift
+  labels:
+    app.kubernetes.io/name: custom-templates
+    flavor.template.kubevirt.io/medium: 'true'
+    os.template.kubevirt.io/rhel10.0: 'true'
+    template.kubevirt.io/architecture: amd64
+    template.kubevirt.io/type: vm
+    vm.kubevirt.io/template: rhel10-haswell
+    vm.kubevirt.io/template.namespace: openshift
+    workload.template.kubevirt.io/server: 'true'
+  annotations:
+    description: RHEL 10 Template using the existing rhel10 VolumeSnapshot DataSource.
+    iconClass: icon-rhel
+    openshift.io/display-name: Red Hat Enterprise Linux 10 (Broadwell-v4)
+    openshift.io/provider-display-name: ''
+    tags: 'kubevirt,virtualmachine,rhel,rhel10'
+    template.kubevirt.io/provider: ''
+objects:
+  - apiVersion: kubevirt.io/v1
+    kind: VirtualMachine
+    metadata:
+      labels:
+        app: '${NAME}'
+        vm.kubevirt.io/template: rhel10-broadwell
+        vm.kubevirt.io/template.namespace: openshift
+      name: '${NAME}'
+    spec:
+      dataVolumeTemplates:
+        - apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: '${NAME}'
+          spec:
+            sourceRef:
+              kind: DataSource
+              name: rhel10
+              namespace: openshift-virtualization-os-images
+            storage:
+              resources:
+                requests:
+                  storage: 30Gi
+      runStrategy: Halted
+      template:
+        metadata:
+          labels:
+            kubevirt.io/domain: '${NAME}'
+        spec:
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: kubernetes.io/hostname
+                        operator: In
+                        values:
+                          - storm5
+                          - storm6
+                    matchFields: []
+          domain:
+            cpu:
+              cores: 1
+              sockets: 1
+              threads: 1
+              model: Broadwell-v4
+            devices:
+              disks:
+                - disk:
+                    bus: virtio
+                  name: rootdisk
+                - disk:
+                    bus: virtio
+                  name: cloudinitdisk
+              interfaces:
+                - masquerade: {}
+                  model: virtio
+                  name: default
+            memory:
+              guest: 4Gi
+          networks:
+            - name: default
+              pod: {}
+          volumes:
+            - dataVolume:
+                name: '${NAME}'
+              name: rootdisk
+            - cloudInitNoCloud:
+                userData: |-
+                  #cloud-config
+                  user: cloud-user
+                  password: ${CLOUD_USER_PASSWORD}
+              name: cloudinitdisk
+parameters:
+  - name: NAME
+    description: Name for the new VM
+    generate: expression
+    from: 'rhel10-[a-z0-9]{6}'
+  - name: CLOUD_USER_PASSWORD
+    description: Password for cloud-user
+    generate: expression
+    from: '[a-z0-9]{8}'

From 581bbb5d9a0531ccef50937cf266c03575dcbe46 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:07:32 +0100
Subject: [PATCH 16/55] Create rhel10-haswellv4.yaml

---
 .../ocp-v/templates/rhel10-haswellv4.yaml     | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 isar-apps/ocp-v/templates/rhel10-haswellv4.yaml

diff --git a/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml b/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
new file mode 100644
index 0000000..aeae60b
--- /dev/null
+++ b/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
@@ -0,0 +1,110 @@
+kind: Template
+apiVersion: template.openshift.io/v1
+metadata:
+  name: rhel10-haswell
+  namespace: openshift
+  labels:
+    template.kubevirt.io/architecture: amd64
+    os.template.kubevirt.io/rhel10.0: 'true'
+    template.kubevirt.io/type: vm
+    vm.kubevirt.io/template: rhel10-ivy-manual
+    flavor.template.kubevirt.io/medium: 'true'
+    template.kubevirt.io/default-os-variant: 'true'
+    app.kubernetes.io/name: custom-templates
+    vm.kubevirt.io/template.namespace: openshift
+    workload.template.kubevirt.io/server: 'true'
+  annotations:
+    description: RHEL 10 Template using the existing rhel10 VolumeSnapshot DataSource.
+    iconClass: icon-rhel
+    openshift.io/display-name: Red Hat Enterprise Linux 10 (Haswell-v4)
+    openshift.io/provider-display-name: ''
+    tags: 'kubevirt,virtualmachine,rhel,rhel10'
+    template.kubevirt.io/provider: ''
+objects:
+  - apiVersion: kubevirt.io/v1
+    kind: VirtualMachine
+    metadata:
+      labels:
+        app: '${NAME}'
+        vm.kubevirt.io/template: rhel10-haswell
+        vm.kubevirt.io/template.namespace: openshift
+      name: '${NAME}'
+    spec:
+      dataVolumeTemplates:
+        - apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: '${NAME}'
+          spec:
+            sourceRef:
+              kind: DataSource
+              name: rhel10
+              namespace: openshift-virtualization-os-images
+            storage:
+              resources:
+                requests:
+                  storage: 30Gi
+      runStrategy: Halted
+      template:
+        metadata:
+          labels:
+            kubevirt.io/domain: '${NAME}'
+        spec:
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: kubernetes.io/hostname
+                        operator: In
+                        values:
+                          - storm5
+                          - storm6
+                          - storm2
+                          - storm3
+                    matchFields: []
+          domain:
+            cpu:
+              cores: 1
+              sockets: 1
+              threads: 1
+              features:
+                - name: vmx-rdseed-exit
+                  policy: disable
+              model: Haswell-v4
+            devices:
+              disks:
+                - disk:
+                    bus: virtio
+                  name: rootdisk
+                - disk:
+                    bus: virtio
+                  name: cloudinitdisk
+              interfaces:
+                - masquerade: {}
+                  model: virtio
+                  name: default
+            memory:
+              guest: 4Gi
+          networks:
+            - name: default
+              pod: {}
+          volumes:
+            - dataVolume:
+                name: '${NAME}'
+              name: rootdisk
+            - cloudInitNoCloud:
+                userData: |
+                  #cloud-config
+                  user: cloud-user
+                  password: redhat123
+              name: cloudinitdisk
+parameters:
+  - name: NAME
+    description: Name for the new VM
+    generate: expression
+    from: 'rhel10-[a-z0-9]{6}'
+  - name: CLOUD_USER_PASSWORD
+    description: Password for cloud-user
+    generate: expression
+    from: '[a-z0-9]{8}'

From 84a8fadd6ab60c4772f2a020c4f3196469be550c Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:08:10 +0100
Subject: [PATCH 17/55] Create rhel10-ivyv2.yaml

---
 isar-apps/ocp-v/templates/rhel10-ivyv2.yaml | 91 +++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 isar-apps/ocp-v/templates/rhel10-ivyv2.yaml

diff --git a/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml b/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml
new file mode 100644
index 0000000..9d09e5b
--- /dev/null
+++ b/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml
@@ -0,0 +1,91 @@
+kind: Template
+apiVersion: template.openshift.io/v1
+metadata:
+  name: rhel10-ivy-manual
+  namespace: openshift
+  labels:
+    flavor.template.kubevirt.io/medium: 'true'
+    os.template.kubevirt.io/rhel10.0: 'true'
+    template.kubevirt.io/architecture: amd64
+    template.kubevirt.io/type: vm
+    workload.template.kubevirt.io/server: 'true'
+  annotations:
+    description: RHEL 10 Template using the existing rhel10 VolumeSnapshot DataSource.
+    iconClass: icon-rhel
+    openshift.io/display-name: Red Hat Enterprise Linux 10 (IvyBridge-v2)
+    tags: 'kubevirt,virtualmachine,rhel,rhel10'
+    template.kubevirt.io/provider: User
+objects:
+  - apiVersion: kubevirt.io/v1
+    kind: VirtualMachine
+    metadata:
+      labels:
+        app: '${NAME}'
+        vm.kubevirt.io/template: rhel10-ivy-manual
+      name: '${NAME}'
+    spec:
+      dataVolumeTemplates:
+        - apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: '${NAME}'
+          spec:
+            sourceRef:
+              kind: DataSource
+              name: rhel10
+              namespace: openshift-virtualization-os-images
+            storage:
+              resources:
+                requests:
+                  storage: 30Gi
+      runStrategy: Halted
+      template:
+        metadata:
+          labels:
+            kubevirt.io/domain: '${NAME}'
+        spec:
+          domain:
+            cpu:
+              cores: 1
+              sockets: 1
+              threads: 1
+              model: IvyBridge-v2
+              features:
+                - name: vmx-rdseed-exit
+                  policy: disable
+            devices:
+              disks:
+                - disk:
+                    bus: virtio
+                  name: rootdisk
+                - disk:
+                    bus: virtio
+                  name: cloudinitdisk
+              interfaces:
+                - masquerade: {}
+                  model: virtio
+                  name: default
+            memory:
+              guest: 4Gi
+          networks:
+            - name: default
+              pod: {}
+          volumes:
+            - dataVolume:
+                name: '${NAME}'
+              name: rootdisk
+            - cloudInitNoCloud:
+                userData: |-
+                  #cloud-config
+                  user: cloud-user
+                  password: ${CLOUD_USER_PASSWORD}
+              name: cloudinitdisk
+parameters:
+  - name: NAME
+    description: Name for the new VM
+    generate: expression
+    from: 'rhel10-[a-z0-9]{6}'
+  - name: CLOUD_USER_PASSWORD
+    description: Password for cloud-user
+    generate: expression
+    from: '[a-z0-9]{8}'

From 5620292fed651a4cef64a79420f775a4514a13f8 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:10:45 +0100
Subject: [PATCH 18/55] Update kustomization.yaml

---
 isar-apps/ocp-v/kustomization.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/isar-apps/ocp-v/kustomization.yaml b/isar-apps/ocp-v/kustomization.yaml
index e496c63..9504369 100644
--- a/isar-apps/ocp-v/kustomization.yaml
+++ b/isar-apps/ocp-v/kustomization.yaml
@@ -8,3 +8,5 @@ resources:
 #- OperatorGroup.yaml
 #- Subscription.yaml
 - MigrationPolicy/
+- instancetypes/
+- templates/

From 5ef3f47edda9c9d90dd540ec1170f1d97cf22b51 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:46:21 +0100
Subject: [PATCH 19/55] Update rhel-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
index c38414f..4397576 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
@@ -1,7 +1,7 @@
 apiVersion: instancetype.kubevirt.io/v1beta1
 kind: VirtualMachineClusterInstancetype
 metadata:
-  name: rhel-hassel-instancetype
+  name: rhel-haswell-instancetype
 spec:
   cpu:
     guest: 2

From 70496fa215f32c49dd25a7b80715ab5a734d20af Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:47:13 +0100
Subject: [PATCH 20/55] Update rhel10-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
index 8c22a3c..6207290 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -1,7 +1,7 @@
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
-  name: rhel10-hassel
+  name: rhel10-haswell
   namespace: openshift-virtualization-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell/Ivy)"
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/component: storage
     kubevirt.io/dynamic-credentials-support: "true"
     os.template.kubevirt.io/rhel9: "true"
-    instancetype.kubevirt.io/default-instancetype: rhel-hassel-instancetype
+    instancetype.kubevirt.io/default-instancetype: rhel-haswell-instancetype
     instancetype.kubevirt.io/default-instancetype-kind: VirtualMachineClusterInstancetype
 spec:
   source:

From 1a98ba20195cdd1153323836f1a4fddf89f9137a Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:47:37 +0100
Subject: [PATCH 21/55] Update rhel9-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
index 8d34c23..7de75d0 100644
--- a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
@@ -1,7 +1,7 @@
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
-  name: rhel9-hassel
+  name: rhel9-haswell
   namespace: openshift-virtualization-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell/Ivy)"
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/component: storage
     kubevirt.io/dynamic-credentials-support: "true"
     os.template.kubevirt.io/rhel9: "true"
-    instancetype.kubevirt.io/default-instancetype: "rhel-hassel-instancetype"
+    instancetype.kubevirt.io/default-instancetype: "rhel-haswell-instancetype"
     instancetype.kubevirt.io/default-instancetype-kind: "VirtualMachineClusterInstancetype"
 spec:
   source:

From 6d394d3206bbfaae716425a21e5426608f0df7f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:58:45 +0100
Subject: [PATCH 22/55] Update rhel10-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
index 6207290..644ebd5 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     app.kubernetes.io/component: storage
     kubevirt.io/dynamic-credentials-support: "true"
-    os.template.kubevirt.io/rhel9: "true"
+    os.template.kubevirt.io/rhel10: "true"
     instancetype.kubevirt.io/default-instancetype: rhel-haswell-instancetype
     instancetype.kubevirt.io/default-instancetype-kind: VirtualMachineClusterInstancetype
 spec:

From c8b44ef86cd632180d68199501486adb33fa2d07 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:15:37 +0100
Subject: [PATCH 23/55] Delete isar-apps/ocp-v/templates/rhel10-ivyv2.yaml

---
 isar-apps/ocp-v/templates/rhel10-ivyv2.yaml | 91 ---------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 isar-apps/ocp-v/templates/rhel10-ivyv2.yaml

diff --git a/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml b/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml
deleted file mode 100644
index 9d09e5b..0000000
--- a/isar-apps/ocp-v/templates/rhel10-ivyv2.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-kind: Template
-apiVersion: template.openshift.io/v1
-metadata:
-  name: rhel10-ivy-manual
-  namespace: openshift
-  labels:
-    flavor.template.kubevirt.io/medium: 'true'
-    os.template.kubevirt.io/rhel10.0: 'true'
-    template.kubevirt.io/architecture: amd64
-    template.kubevirt.io/type: vm
-    workload.template.kubevirt.io/server: 'true'
-  annotations:
-    description: RHEL 10 Template using the existing rhel10 VolumeSnapshot DataSource.
-    iconClass: icon-rhel
-    openshift.io/display-name: Red Hat Enterprise Linux 10 (IvyBridge-v2)
-    tags: 'kubevirt,virtualmachine,rhel,rhel10'
-    template.kubevirt.io/provider: User
-objects:
-  - apiVersion: kubevirt.io/v1
-    kind: VirtualMachine
-    metadata:
-      labels:
-        app: '${NAME}'
-        vm.kubevirt.io/template: rhel10-ivy-manual
-      name: '${NAME}'
-    spec:
-      dataVolumeTemplates:
-        - apiVersion: cdi.kubevirt.io/v1beta1
-          kind: DataVolume
-          metadata:
-            name: '${NAME}'
-          spec:
-            sourceRef:
-              kind: DataSource
-              name: rhel10
-              namespace: openshift-virtualization-os-images
-            storage:
-              resources:
-                requests:
-                  storage: 30Gi
-      runStrategy: Halted
-      template:
-        metadata:
-          labels:
-            kubevirt.io/domain: '${NAME}'
-        spec:
-          domain:
-            cpu:
-              cores: 1
-              sockets: 1
-              threads: 1
-              model: IvyBridge-v2
-              features:
-                - name: vmx-rdseed-exit
-                  policy: disable
-            devices:
-              disks:
-                - disk:
-                    bus: virtio
-                  name: rootdisk
-                - disk:
-                    bus: virtio
-                  name: cloudinitdisk
-              interfaces:
-                - masquerade: {}
-                  model: virtio
-                  name: default
-            memory:
-              guest: 4Gi
-          networks:
-            - name: default
-              pod: {}
-          volumes:
-            - dataVolume:
-                name: '${NAME}'
-              name: rootdisk
-            - cloudInitNoCloud:
-                userData: |-
-                  #cloud-config
-                  user: cloud-user
-                  password: ${CLOUD_USER_PASSWORD}
-              name: cloudinitdisk
-parameters:
-  - name: NAME
-    description: Name for the new VM
-    generate: expression
-    from: 'rhel10-[a-z0-9]{6}'
-  - name: CLOUD_USER_PASSWORD
-    description: Password for cloud-user
-    generate: expression
-    from: '[a-z0-9]{8}'

From ec7d7945e7896b24801764deafd94f4d852977ed Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:19:26 +0100
Subject: [PATCH 24/55] Rename rhel-vmcit.yaml to rhel-haswell-vmcit.yaml

---
 .../instancetypes/{rhel-vmcit.yaml => rhel-haswell-vmcit.yaml}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename isar-apps/ocp-v/instancetypes/{rhel-vmcit.yaml => rhel-haswell-vmcit.yaml} (100%)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
similarity index 100%
rename from isar-apps/ocp-v/instancetypes/rhel-vmcit.yaml
rename to isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml

From 1833d5180a8830feb121d7497f96df90b94f3b18 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:21:32 +0100
Subject: [PATCH 25/55] Create rhel-vmcit-broadwell.yaml

---
 .../rhel-vmcit-broadwell.yaml                        | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml

diff --git a/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml b/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml
new file mode 100644
index 0000000..ba14f06
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml	
@@ -0,0 +1,12 @@
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachineClusterInstancetype
+metadata:
+  name: rhel-broadwell-instancetype
+spec:
+  cpu:
+    guest: 2
+    model: "Broadwell-v4"
+  memory:
+    guest: "4Gi"
+  nodeSelector:
+    usage: "rhel9-broadwell"

From 8481e11a4f9c29352688369bcfb165919170bec0 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:22:26 +0100
Subject: [PATCH 26/55] Create rhel-vmcit-broadwell.yaml

---
 .../ocp-v/instancetypes/rhel-vmcit-broadwell.yaml    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml b/isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml
new file mode 100644
index 0000000..ba14f06
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml
@@ -0,0 +1,12 @@
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachineClusterInstancetype
+metadata:
+  name: rhel-broadwell-instancetype
+spec:
+  cpu:
+    guest: 2
+    model: "Broadwell-v4"
+  memory:
+    guest: "4Gi"
+  nodeSelector:
+    usage: "rhel9-broadwell"

From 607695244ab4e4a8d8496c6f899fe914b2620c53 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:22:38 +0100
Subject: [PATCH 27/55] Delete isar-apps/ocp-v/instancetypes/apiVersion:
 instancetype.kubevirt.io directory

---
 .../rhel-vmcit-broadwell.yaml                        | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml

diff --git a/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml b/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml
deleted file mode 100644
index ba14f06..0000000
--- a/isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevirt.io/rhel-vmcit-broadwell.yaml	
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: instancetype.kubevirt.io/v1beta1
-kind: VirtualMachineClusterInstancetype
-metadata:
-  name: rhel-broadwell-instancetype
-spec:
-  cpu:
-    guest: 2
-    model: "Broadwell-v4"
-  memory:
-    guest: "4Gi"
-  nodeSelector:
-    usage: "rhel9-broadwell"

From 3eb987a8dcaacf7e857c000ad1bc02cab1168acb Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:23:49 +0100
Subject: [PATCH 28/55] Rename rhel-vmcit-broadwell.yaml to
 rhel-broadwell-vmcit.yaml

---
 .../{rhel-vmcit-broadwell.yaml => rhel-broadwell-vmcit.yaml}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename isar-apps/ocp-v/instancetypes/{rhel-vmcit-broadwell.yaml => rhel-broadwell-vmcit.yaml} (100%)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
similarity index 100%
rename from isar-apps/ocp-v/instancetypes/rhel-vmcit-broadwell.yaml
rename to isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml

From 0bf8f2fc05a12f825097fe0431853b9565848fbc Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:31:04 +0100
Subject: [PATCH 29/55] Update rhel10-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
index 644ebd5..463bf86 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rhel10-haswell
   namespace: openshift-virtualization-os-images
   annotations:
-    virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell/Ivy)"
+    virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell)"
   labels:
     app.kubernetes.io/component: storage
     kubevirt.io/dynamic-credentials-support: "true"

From 706177b8ea6d4d409ffdd60bacde6ab4f662ffab Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:31:34 +0100
Subject: [PATCH 30/55] Update rhel9-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
index 7de75d0..51016ec 100644
--- a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rhel9-haswell
   namespace: openshift-virtualization-os-images
   annotations:
-    virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell/Ivy)"
+    virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell)"
   labels:
     app.kubernetes.io/component: storage
     kubevirt.io/dynamic-credentials-support: "true"

From e81deae28e6bbba0c76707b985b6b38a2b723309 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:36:22 +0100
Subject: [PATCH 31/55] Update rhel-broadwell-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
index ba14f06..c2f134c 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
@@ -9,4 +9,4 @@ spec:
   memory:
     guest: "4Gi"
   nodeSelector:
-    usage: "rhel9-broadwell"
+    usage: "rhel-broadwell"

From c05e78a5fea35c368f4eebb91b25edb3af62bb26 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:37:51 +0100
Subject: [PATCH 32/55] Update rhel-broadwell-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
index c2f134c..c2c49c6 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
@@ -9,4 +9,4 @@ spec:
   memory:
     guest: "4Gi"
   nodeSelector:
-    usage: "rhel-broadwell"
+    usage-broadwell: "yes"

From cce2a511411a939ae9cae709948cfb8105a3b1f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:38:30 +0100
Subject: [PATCH 33/55] Update rhel-haswell-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
index 4397576..1242103 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
@@ -9,4 +9,4 @@ spec:
   memory:
     guest: "4Gi"
   nodeSelector:
-    usage: "rhel9-hassel"
+    usage-haswell: "yes"

From cd67bed7d65cfa7d84349e2fdd83bfcfd43033b2 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:47:17 +0100
Subject: [PATCH 34/55] Update rhel10-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
index 463bf86..171d568 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -1,7 +1,7 @@
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
-  name: rhel10-haswell
+  name: custom-rhel10-haswell
   namespace: openshift-virtualization-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell)"

From e34ff0b7455e452b319ce770a2194b875aec9a6a Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:47:44 +0100
Subject: [PATCH 35/55] Update rhel9-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
index 51016ec..6d8a0df 100644
--- a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
@@ -1,7 +1,7 @@
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
-  name: rhel9-haswell
+  name: custom-rhel9-haswell
   namespace: openshift-virtualization-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell)"

From 32b1843a9370652d01b9acdd087c5899e9657607 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:48:08 +0100
Subject: [PATCH 36/55] Update rhel-broadwell-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
index c2c49c6..17513ee 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml
@@ -1,7 +1,7 @@
 apiVersion: instancetype.kubevirt.io/v1beta1
 kind: VirtualMachineClusterInstancetype
 metadata:
-  name: rhel-broadwell-instancetype
+  name: custom-rhel-broadwell-instancetype
 spec:
   cpu:
     guest: 2

From 64ca573d0731aaceb83b4c352410a5ba7f7f2cee Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:48:25 +0100
Subject: [PATCH 37/55] Update rhel-haswell-vmcit.yaml

---
 isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml b/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
index 1242103..79cd77c 100644
--- a/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml
@@ -1,7 +1,7 @@
 apiVersion: instancetype.kubevirt.io/v1beta1
 kind: VirtualMachineClusterInstancetype
 metadata:
-  name: rhel-haswell-instancetype
+  name: custom-rhel-haswell-instancetype
 spec:
   cpu:
     guest: 2

From 7e531d59b6c0d3aefe05bb6e45de2888b91ddd71 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:49:37 +0100
Subject: [PATCH 38/55] Update rhel10-broadwell.yaml

---
 isar-apps/ocp-v/templates/rhel10-broadwell.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/isar-apps/ocp-v/templates/rhel10-broadwell.yaml b/isar-apps/ocp-v/templates/rhel10-broadwell.yaml
index 0eaa361..b7ce86c 100644
--- a/isar-apps/ocp-v/templates/rhel10-broadwell.yaml
+++ b/isar-apps/ocp-v/templates/rhel10-broadwell.yaml
@@ -1,7 +1,7 @@
 kind: Template
 apiVersion: template.openshift.io/v1
 metadata:
-  name: rhel10-broadwell
+  name: custom-rhel10-broadwell
   namespace: openshift
   labels:
     app.kubernetes.io/name: custom-templates
@@ -9,7 +9,7 @@ metadata:
     os.template.kubevirt.io/rhel10.0: 'true'
     template.kubevirt.io/architecture: amd64
     template.kubevirt.io/type: vm
-    vm.kubevirt.io/template: rhel10-haswell
+    vm.kubevirt.io/template: custom-rhel10-broadwell
     vm.kubevirt.io/template.namespace: openshift
     workload.template.kubevirt.io/server: 'true'
   annotations:
@@ -25,7 +25,7 @@ objects:
     metadata:
       labels:
         app: '${NAME}'
-        vm.kubevirt.io/template: rhel10-broadwell
+        vm.kubevirt.io/template: custom-rhel10-broadwell
         vm.kubevirt.io/template.namespace: openshift
       name: '${NAME}'
     spec:

From dff561cf2bbb1dc82da84988c8c88e5f0d3235a7 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:50:43 +0100
Subject: [PATCH 39/55] Update rhel9-broadwell.yaml

---
 isar-apps/ocp-v/templates/rhel9-broadwell.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/isar-apps/ocp-v/templates/rhel9-broadwell.yaml b/isar-apps/ocp-v/templates/rhel9-broadwell.yaml
index 7521f81..c367dfb 100644
--- a/isar-apps/ocp-v/templates/rhel9-broadwell.yaml
+++ b/isar-apps/ocp-v/templates/rhel9-broadwell.yaml
@@ -1,7 +1,7 @@
 kind: Template
 apiVersion: template.openshift.io/v1
 metadata:
-  name: rhel9-broadwell
+  name: custom-rhel9-broadwell
   namespace: openshift
   labels:
     app.kubernetes.io/part-of: hyperconverged-cluster
@@ -9,7 +9,7 @@ metadata:
     template.kubevirt.io/version: v0.34.1
     app.kubernetes.io/version: 4.20.3
     template.kubevirt.io/type: vm
-    vm.kubevirt.io/template: rhel9-haswell
+    vm.kubevirt.io/template: custom-rhel9-broadwell
     app.kubernetes.io/component: templating
     app.kubernetes.io/managed-by: ssp-operator
     flavor.template.kubevirt.io/medium: 'true'
@@ -79,7 +79,7 @@ objects:
       labels:
         app: '${NAME}'
         kubevirt.io/dynamic-credentials-support: 'true'
-        vm.kubevirt.io/template: rhel9-broadwell
+        vm.kubevirt.io/template: custom-rhel9-broadwell
         vm.kubevirt.io/template.revision: '1'
         vm.kubevirt.io/template.namespace: openshift
       name: '${NAME}'

From c5251b7d6407296ba061b0e4f6833e7ea50333d9 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:51:23 +0100
Subject: [PATCH 40/55] Update rhel10-haswellv4.yaml

---
 isar-apps/ocp-v/templates/rhel10-haswellv4.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml b/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
index aeae60b..9ae6ee3 100644
--- a/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
+++ b/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
@@ -1,7 +1,7 @@
 kind: Template
 apiVersion: template.openshift.io/v1
 metadata:
-  name: rhel10-haswell
+  name: custom-rhel10-haswell
   namespace: openshift
   labels:
     template.kubevirt.io/architecture: amd64
@@ -26,7 +26,7 @@ objects:
     metadata:
       labels:
         app: '${NAME}'
-        vm.kubevirt.io/template: rhel10-haswell
+        vm.kubevirt.io/template: custom-rhel10-haswell
         vm.kubevirt.io/template.namespace: openshift
       name: '${NAME}'
     spec:

From 37e1a2e411fe470d7ebf7c3e348846a2eb41b941 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:17:27 +0100
Subject: [PATCH 41/55] Update and rename rhel9-haswellv4.yaml to
 rhel9-haswell.yaml

---
 .../templates/{rhel9-haswellv4.yaml => rhel9-haswell.yaml}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename isar-apps/ocp-v/templates/{rhel9-haswellv4.yaml => rhel9-haswell.yaml} (98%)

diff --git a/isar-apps/ocp-v/templates/rhel9-haswellv4.yaml b/isar-apps/ocp-v/templates/rhel9-haswell.yaml
similarity index 98%
rename from isar-apps/ocp-v/templates/rhel9-haswellv4.yaml
rename to isar-apps/ocp-v/templates/rhel9-haswell.yaml
index 290f326..fe1733e 100644
--- a/isar-apps/ocp-v/templates/rhel9-haswellv4.yaml
+++ b/isar-apps/ocp-v/templates/rhel9-haswell.yaml
@@ -1,7 +1,7 @@
 kind: Template
 apiVersion: template.openshift.io/v1
 metadata:
-  name: rhel9-haswellv4
+  name: custom-rhel9-haswell
   namespace: openshift
   labels:
     app.kubernetes.io/part-of: hyperconverged-cluster
@@ -9,7 +9,7 @@ metadata:
     template.kubevirt.io/version: v0.34.1
     app.kubernetes.io/version: 4.20.3
     template.kubevirt.io/type: vm
-    vm.kubevirt.io/template: rhel9-haswell
+    vm.kubevirt.io/template: custom-rhel9-haswell
     app.kubernetes.io/component: templating
     app.kubernetes.io/managed-by: ssp-operator
     flavor.template.kubevirt.io/medium: 'true'
@@ -80,7 +80,7 @@ objects:
       labels:
         app: '${NAME}'
         kubevirt.io/dynamic-credentials-support: 'true'
-        vm.kubevirt.io/template: rhel9-haswellv4
+        vm.kubevirt.io/template: custom-rhel9-haswell
         vm.kubevirt.io/template.revision: '1'
         vm.kubevirt.io/template.namespace: openshift
         template.kubevirt.io/default-os-variant: 'true'

From 469cd57d3f6ae62426cac4648d9a29ce74b23430 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:17:51 +0100
Subject: [PATCH 42/55] Rename rhel10-haswellv4.yaml to rhel10-haswell.yaml

---
 .../templates/{rhel10-haswellv4.yaml => rhel10-haswell.yaml}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename isar-apps/ocp-v/templates/{rhel10-haswellv4.yaml => rhel10-haswell.yaml} (100%)

diff --git a/isar-apps/ocp-v/templates/rhel10-haswellv4.yaml b/isar-apps/ocp-v/templates/rhel10-haswell.yaml
similarity index 100%
rename from isar-apps/ocp-v/templates/rhel10-haswellv4.yaml
rename to isar-apps/ocp-v/templates/rhel10-haswell.yaml

From 200d84979cca85f98a56c75351926ab417504300 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:18:28 +0100
Subject: [PATCH 43/55] Update rhel10-haswell.yaml

---
 isar-apps/ocp-v/templates/rhel10-haswell.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/templates/rhel10-haswell.yaml b/isar-apps/ocp-v/templates/rhel10-haswell.yaml
index 9ae6ee3..5262da7 100644
--- a/isar-apps/ocp-v/templates/rhel10-haswell.yaml
+++ b/isar-apps/ocp-v/templates/rhel10-haswell.yaml
@@ -7,7 +7,7 @@ metadata:
     template.kubevirt.io/architecture: amd64
     os.template.kubevirt.io/rhel10.0: 'true'
     template.kubevirt.io/type: vm
-    vm.kubevirt.io/template: rhel10-ivy-manual
+    vm.kubevirt.io/template: custom-rhel10-haswell
     flavor.template.kubevirt.io/medium: 'true'
     template.kubevirt.io/default-os-variant: 'true'
     app.kubernetes.io/name: custom-templates

From f60707c3c7d96cf5a2cd7a336a873b5adeeb42e6 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:19:35 +0100
Subject: [PATCH 44/55] Create setup.yaml

---
 isar-apps/ocp-v/instancetypes/setup.yaml | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/setup.yaml

diff --git a/isar-apps/ocp-v/instancetypes/setup.yaml b/isar-apps/ocp-v/instancetypes/setup.yaml
new file mode 100644
index 0000000..41a8114
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/setup.yaml
@@ -0,0 +1,35 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: custom-os-images
+  labels:
+    openshift.io/cluster-monitoring: "true"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: all-user-view-images
+  namespace: custom-os-images
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: view
+subjects:
+- kind: Group
+  name: system:authenticated
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cdi-image-puller
+  namespace: custom-os-images
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:image-puller
+subjects:
+- kind: ServiceAccount
+  name: cdi-sa
+  namespace: openshift-cnv

From 1fba21b5d9b0552e5479d7220d3ca2934960ab20 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:19:54 +0100
Subject: [PATCH 45/55] Update secret-rhel.yaml

---
 isar-apps/ocp-v/instancetypes/secret-rhel.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/secret-rhel.yaml b/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
index 0f27ae8..9ab06be 100644
--- a/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
+++ b/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: redhat-registry-credentials
-  namespace: openshift-virtualization-os-images
+  namespace: custom-os-images
 type: Opaque
 data:
   accessKeyId: d21hcng=

From 3c82aae500220db30b2f0e2785894c5be1de214f Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:20:15 +0100
Subject: [PATCH 46/55] Update rhel9-dv-import.yaml

---
 isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml b/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml
index 4ce0c76..dfddff1 100644
--- a/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml
@@ -2,7 +2,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   name: rhel9-clean-base
-  namespace: openshift-virtualization-os-images
+  namespace: custom-os-images
 spec:
   source:
     registry:

From ee67f1fe39d22da80df8dd30aef0c5fb260f6abc Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:20:35 +0100
Subject: [PATCH 47/55] Update rhel9-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
index 6d8a0df..1ffda5d 100644
--- a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
@@ -2,7 +2,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
   name: custom-rhel9-haswell
-  namespace: openshift-virtualization-os-images
+  namespace: custom-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 9 Custom (Haswell)"
   labels:
@@ -15,4 +15,4 @@ spec:
   source:
     pvc:
       name: rhel9-clean-base
-      namespace: openshift-virtualization-os-images
+      namespace: custom-os-images

From a01f23fed282b0b9e8db337cd30a8d0de99de321 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:21:00 +0100
Subject: [PATCH 48/55] Update rhel10-dv-import.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml b/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml
index b7644de..5ae520b 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml
@@ -2,7 +2,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   name: rhel10-clean-base
-  namespace: openshift-virtualization-os-images
+  namespace: custom-os-images
 spec:
   source:
     registry:

From 1b9bf3ff6dfc0d2cdfd06a169612a9d3876818ba Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:21:20 +0100
Subject: [PATCH 49/55] Update rhel10-ds-custom.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
index 171d568..9a172ff 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
@@ -2,7 +2,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataSource
 metadata:
   name: custom-rhel10-haswell
-  namespace: openshift-virtualization-os-images
+  namespace: custom-os-images
   annotations:
     virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Haswell)"
   labels:
@@ -15,4 +15,4 @@ spec:
   source:
     pvc:
       name: rhel10-clean-base
-      namespace: openshift-virtualization-os-images
+      namespace: custom-os-images

From adb1d12ed08f97b5090d7ea2e0bc642f642b43c4 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:33:35 +0100
Subject: [PATCH 50/55] Rename rhel10-ds-custom.yaml to
 rhel10-ds-custom-haswell.yaml

---
 .../{rhel10-ds-custom.yaml => rhel10-ds-custom-haswell.yaml}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename isar-apps/ocp-v/instancetypes/{rhel10-ds-custom.yaml => rhel10-ds-custom-haswell.yaml} (100%)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-haswell.yaml
similarity index 100%
rename from isar-apps/ocp-v/instancetypes/rhel10-ds-custom.yaml
rename to isar-apps/ocp-v/instancetypes/rhel10-ds-custom-haswell.yaml

From 2ac6bb01558381b6242442a18ec392e315e70040 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:34:03 +0100
Subject: [PATCH 51/55] Rename rhel9-ds-custom.yaml to
 rhel9-ds-custom-haswell.yaml

---
 .../{rhel9-ds-custom.yaml => rhel9-ds-custom-haswell.yaml}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename isar-apps/ocp-v/instancetypes/{rhel9-ds-custom.yaml => rhel9-ds-custom-haswell.yaml} (100%)

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom-haswell.yaml
similarity index 100%
rename from isar-apps/ocp-v/instancetypes/rhel9-ds-custom.yaml
rename to isar-apps/ocp-v/instancetypes/rhel9-ds-custom-haswell.yaml

From ac9ec6a8388a33a30bb0c32a4de3013face4a39e Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:36:09 +0100
Subject: [PATCH 52/55] Create rhel9-ds-custom-broadwell.yaml

---
 .../rhel9-ds-custom-broadwell.yaml             | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel9-ds-custom-broadwell.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel9-ds-custom-broadwell.yaml b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom-broadwell.yaml
new file mode 100644
index 0000000..772c6b0
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel9-ds-custom-broadwell.yaml
@@ -0,0 +1,18 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataSource
+metadata:
+  name: custom-rhel10-broadwell
+  namespace: custom-os-images
+  annotations:
+    virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Broadwell)"
+  labels:
+    app.kubernetes.io/component: storage
+    kubevirt.io/dynamic-credentials-support: "true"
+    os.template.kubevirt.io/rhel10: "true"
+    instancetype.kubevirt.io/default-instancetype: rhel-broadwell-instancetype
+    instancetype.kubevirt.io/default-instancetype-kind: VirtualMachineClusterInstancetype
+spec:
+  source:
+    pvc:
+      name: rhel10-clean-base
+      namespace: custom-os-images

From b35ab3fc2412f42cee81d2ef98f01cf8b667d7b2 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:36:41 +0100
Subject: [PATCH 53/55] Create rhel10-ds-custom-broadwell.yaml

---
 isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml
@@ -0,0 +1 @@
+

From 0fbcb961b85d1bb30ea55bbfa62274f68cd63684 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:37:16 +0100
Subject: [PATCH 54/55] Update rhel10-ds-custom-broadwell.yaml

---
 .../rhel10-ds-custom-broadwell.yaml            | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml
index 8b13789..ce9e7f3 100644
--- a/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml
+++ b/isar-apps/ocp-v/instancetypes/rhel10-ds-custom-broadwell.yaml
@@ -1 +1,19 @@
 
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataSource
+metadata:
+  name: custom-rhel10-broadwell
+  namespace: custom-os-images
+  annotations:
+    virt.kubevirt.io/os-display-name: "RHEL 10 Custom (Broadwell)"
+  labels:
+    app.kubernetes.io/component: storage
+    kubevirt.io/dynamic-credentials-support: "true"
+    os.template.kubevirt.io/rhel10: "true"
+    instancetype.kubevirt.io/default-instancetype: rhel-broadwell-instancetype
+    instancetype.kubevirt.io/default-instancetype-kind: VirtualMachineClusterInstancetype
+spec:
+  source:
+    pvc:
+      name: rhel10-clean-base
+      namespace: custom-os-images

From f2689f85ddf495a217b2977df7c5a7dfe54f2f08 Mon Sep 17 00:00:00 2001
From: Wolfgang Marx <46625474+tux1980@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:37:05 +0100
Subject: [PATCH 55/55] Delete isar-apps/ocp-v/instancetypes/secret-rhel.yaml

---
 isar-apps/ocp-v/instancetypes/secret-rhel.yaml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 isar-apps/ocp-v/instancetypes/secret-rhel.yaml

diff --git a/isar-apps/ocp-v/instancetypes/secret-rhel.yaml b/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
deleted file mode 100644
index 9ab06be..0000000
--- a/isar-apps/ocp-v/instancetypes/secret-rhel.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: redhat-registry-credentials
-  namespace: custom-os-images
-type: Opaque
-data:
-  accessKeyId: d21hcng=
-  secretKey: T3JiaXQxMjMh