diff --git a/repos/helm/ubuntu.yaml b/repos/helm/ubuntu.yaml
deleted file mode 100644
index 17f09a0..0000000
--- a/repos/helm/ubuntu.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: ubuntu-vm-helm
-  namespace: ${TENANT_NAMESPACE}-ns
-spec:
-  vmName: ubuntu-helm
-  namespace: kubevirt-vms
-  imageURL: "quay.io/containerdisks/ubuntu:22.04"
-  storageSize: 40Gi
-  storageClassName: standard
-  cpu: 2
-  memory: 4Gi
diff --git a/ubuntu-vm/ks.yaml b/ubuntu-vm-1/ks.yaml
similarity index 92%
rename from ubuntu-vm/ks.yaml
rename to ubuntu-vm-1/ks.yaml
index 6139916..69aa5cb 100644
--- a/ubuntu-vm/ks.yaml
+++ b/ubuntu-vm-1/ks.yaml
@@ -7,7 +7,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./ubuntu-vm/ubuntu
+  path: ./ubuntu-vm-1/ubuntu
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/ubuntu-vm/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml
similarity index 92%
rename from ubuntu-vm/ubuntu/ubuntu-vm.yaml
rename to ubuntu-vm-1/ubuntu/ubuntu-vm.yaml
index ac232f3..af8a38c 100644
--- a/ubuntu-vm/ubuntu/ubuntu-vm.yaml
+++ b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml
@@ -1,14 +1,14 @@
 apiVersion: kubevirt.io/v1
 kind: VirtualMachine
 metadata:
-  name: ubuntu-vm
+  name: ubuntu-vm-1
   namespace: kubevirt-vms
 spec:
   running: true
   template:
     metadata:
       labels:
-        kubevirt.io/domain: ubuntu-vm
+        kubevirt.io/domain: ubuntu-vm-1
     spec:
       domain:
         cpu:
@@ -38,7 +38,7 @@ spec:
           cloudInitNoCloud:
             userData: |
               #cloud-config
-              hostname: ubuntu-vm
+              hostname: ubuntu-vm-1
               ssh_pwauth: True
               users:
                 - name: ubuntu
diff --git a/ubuntu-vm-helm/ks.yaml b/ubuntu-vm-helm/ks.yaml
deleted file mode 100644
index eb3b7fb..0000000
--- a/ubuntu-vm-helm/ks.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app ubuntu-vm-helm
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./ubuntu-vm-helm/ubuntu
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: tenant-repos
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
diff --git a/ubuntu-vm-helm/ubuntu/helmrelease.yaml b/ubuntu-vm-helm/ubuntu/helmrelease.yaml
deleted file mode 100644
index 63dba14..0000000
--- a/ubuntu-vm-helm/ubuntu/helmrelease.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: &app ubuntu-vm-helm
-spec:
-  serviceAccountName: ${TECHNICAL_ACCOUNT}
-  interval: 30m
-  chart:
-    spec:
-      chart: ./repos/helm   # local path in Git repo
-      sourceRef:
-        kind: GitRepository
-        name: tenant-repos
-        namespace: ${TENANT_NAMESPACE}
-  values:
-    vmName: ubuntu-helm
-    namespace: kubevirt-vms
-    imageURL: "quay.io/containerdisks/ubuntu:22.04"
-    storageSize: 50Gi
-    cpu: 4
-    memory: 4Gi
\ No newline at end of file
diff --git a/ubuntu-vm-helm/ubuntu/template/datavolume b/ubuntu-vm-helm/ubuntu/template/datavolume
deleted file mode 100644
index b7e595d..0000000
--- a/ubuntu-vm-helm/ubuntu/template/datavolume
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: cdi.kubevirt.io/v1beta1
-kind: DataVolume
-metadata:
-  name: {{ .Values.vmName }}-dv
-  namespace: {{ .Values.namespace }}
-spec:
-  source:
-    http:
-      url: "{{ .Values.imageURL }}"
-  contentType: kubevirt
-  pvc:
-    accessModes:
-      - ReadWriteOnce
-    resources:
-      requests:
-        storage: {{ .Values.storageSize }}
-    storageClassName: {{ .Values.storageClassName }}
\ No newline at end of file
diff --git a/ubuntu-vm-helm/ubuntu/template/values b/ubuntu-vm-helm/ubuntu/template/values
deleted file mode 100644
index ec5e28e..0000000
--- a/ubuntu-vm-helm/ubuntu/template/values
+++ /dev/null
@@ -1,7 +0,0 @@
-vmName: windows-vm
-namespace: kubevirt-vms
-imageURL: "quay.io/containerdisks/ubuntu:22.04"
-storageSize: 40Gi
-storageClassName: standard
-cpu: 2
-memory: 4Gi
\ No newline at end of file
diff --git a/ubuntu-vm-helm/ubuntu/template/vm b/ubuntu-vm-helm/ubuntu/template/vm
deleted file mode 100644
index ff020aa..0000000
--- a/ubuntu-vm-helm/ubuntu/template/vm
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: {{ .Values.vmName }}
-  namespace: {{ .Values.namespace }}
-spec:
-  running: true
-  template:
-    metadata:
-      labels:
-        kubevirt.io/domain: {{ .Values.vmName }}
-    spec:
-      domain:
-        cpu:
-          cores: {{ .Values.cpu }}
-        devices:
-          disks:
-            - name: rootdisk
-              disk:
-                bus: virtio
-        resources:
-          requests:
-            memory: {{ .Values.memory }}
-      volumes:
-        - name: rootdisk
-          persistentVolumeClaim:
-            claimName: {{ .Values.vmName }}-dv
\ No newline at end of file