diff --git a/frontend/packages/kubevirt-plugin/src/models.ts b/frontend/packages/kubevirt-plugin/src/models/index.ts
similarity index 100%
rename from frontend/packages/kubevirt-plugin/src/models.ts
rename to frontend/packages/kubevirt-plugin/src/models/index.ts
diff --git a/frontend/packages/kubevirt-plugin/src/models/templates/index.ts b/frontend/packages/kubevirt-plugin/src/models/templates/index.ts
new file mode 100644
index 00000000000..2e0ad0437ea
--- /dev/null
+++ b/frontend/packages/kubevirt-plugin/src/models/templates/index.ts
@@ -0,0 +1,2 @@
+export * from './vm-template-yaml';
+export * from './vm-yaml';
diff --git a/frontend/packages/kubevirt-plugin/src/yaml-templates.ts b/frontend/packages/kubevirt-plugin/src/models/templates/vm-template-yaml.ts
similarity index 66%
rename from frontend/packages/kubevirt-plugin/src/yaml-templates.ts
rename to frontend/packages/kubevirt-plugin/src/models/templates/vm-template-yaml.ts
index 5fcc57aa255..b9766c316c7 100644
--- a/frontend/packages/kubevirt-plugin/src/yaml-templates.ts
+++ b/frontend/packages/kubevirt-plugin/src/models/templates/vm-template-yaml.ts
@@ -1,50 +1,10 @@
 import { Map as ImmutableMap } from 'immutable';
 
 import { TemplateModel } from '@console/internal/models';
-import { VirtualMachineModel } from './models';
 
-export const yamlTemplates = ImmutableMap()
-  .setIn(
-    [VirtualMachineModel, 'default'],
-    `
-apiVersion: ${VirtualMachineModel.apiGroup}/${VirtualMachineModel.apiVersion}
-kind: ${VirtualMachineModel.kind}
-metadata:
-  name: example
-spec:
-  running: false
-  template:
-    spec:
-      domain:
-        devices:
-          disks:
-            - name: containerdisk
-              disk:
-                bus: virtio
-            - name: cloudinitdisk
-              disk:
-                bus: virtio
-          interfaces:
-          - name: default
-            bridge: {}
-        resources:
-          requests:
-            memory: 64M
-      networks:
-      - name: default
-        pod: {}
-      volumes:
-        - name: containerdisk
-          containerDisk:
-            image: kubevirt/cirros-registry-disk-demo
-        - name: cloudinitdisk
-          cloudInitNoCloud:
-            userDataBase64: SGkuXG4=
-`,
-  )
-  .setIn(
-    [TemplateModel, 'vm-template'],
-    `
+export const VMTemplateYAMLTemplates = ImmutableMap().setIn(
+  ['vm-template'],
+  `
 apiVersion: ${TemplateModel.apiGroup}/${TemplateModel.apiVersion}
 kind: ${TemplateModel.kind}
 metadata:
@@ -113,4 +73,4 @@ parameters:
     description: Amount of cores
     value: '4'
 `,
-  );
+);
diff --git a/frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts b/frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
new file mode 100644
index 00000000000..885f2dc83a6
--- /dev/null
+++ b/frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
@@ -0,0 +1,42 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import { VirtualMachineModel } from '..';
+
+export const VirtualMachineYAMLTemplates = ImmutableMap().setIn(
+  ['default'],
+  `
+apiVersion: ${VirtualMachineModel.apiGroup}/${VirtualMachineModel.apiVersion}
+kind: ${VirtualMachineModel.kind}
+metadata:
+  name: example
+spec:
+  running: false
+  template:
+    spec:
+      domain:
+        devices:
+          disks:
+            - name: containerdisk
+              disk:
+                bus: virtio
+            - name: cloudinitdisk
+              disk:
+                bus: virtio
+          interfaces:
+          - name: default
+            bridge: {}
+        resources:
+          requests:
+            memory: 64M
+      networks:
+      - name: default
+        pod: {}
+      volumes:
+        - name: containerdisk
+          containerDisk:
+            image: kubevirt/cirros-registry-disk-demo
+        - name: cloudinitdisk
+          cloudInitNoCloud:
+            userDataBase64: SGkuXG4=
+`,
+);
diff --git a/frontend/packages/kubevirt-plugin/src/plugin.ts b/frontend/packages/kubevirt-plugin/src/plugin.ts
index 035b9edb86e..96d9edb6cca 100644
--- a/frontend/packages/kubevirt-plugin/src/plugin.ts
+++ b/frontend/packages/kubevirt-plugin/src/plugin.ts
@@ -12,7 +12,7 @@ import {
 import { TemplateModel } from '@console/internal/models';
 
 import * as models from './models';
-import { yamlTemplates } from './yaml-templates';
+import { VMTemplateYAMLTemplates, VirtualMachineYAMLTemplates } from './models/templates';
 
 import './style.scss';
 
@@ -82,14 +82,14 @@ const plugin: Plugin<ConsumedExtensions> = [
     type: 'YAMLTemplate',
     properties: {
       model: models.VirtualMachineModel,
-      template: yamlTemplates.getIn([models.VirtualMachineModel, 'default']),
+      template: VirtualMachineYAMLTemplates.getIn(['default']),
     },
   },
   {
     type: 'YAMLTemplate',
     properties: {
       model: TemplateModel,
-      template: yamlTemplates.getIn([TemplateModel, 'vm-template']),
+      template: VMTemplateYAMLTemplates.getIn(['vm-template']),
       templateName: 'vm-template',
     },
   },