diff --git a/modules/bases/debian_stretch/secgen_metadata.xml b/modules/bases/debian_stretch/secgen_metadata.xml
index e5e94313c..1469049e7 100644
--- a/modules/bases/debian_stretch/secgen_metadata.xml
+++ b/modules/bases/debian_stretch/secgen_metadata.xml
@@ -15,7 +15,7 @@
   <platform>unix</platform>
   <distro>Debian 9.5.0 Stretch amd64</distro>
   <url>https://app.vagrantup.com/secgen/boxes/debian_stretch_server/versions/1.1/providers/virtualbox.box</url>
-  <ovirt_template>debian_stretch_server_231018</ovirt_template>
+  <ovirt_template>debian_stretch_server_n</ovirt_template>
 
   <software_license>various</software_license>
-</base>
\ No newline at end of file
+</base>
diff --git a/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml b/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
index 41d11e7e9..0a4c24c97 100644
--- a/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
+++ b/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
@@ -14,7 +14,7 @@
   <platform>unix</platform>
   <distro>Debian 9.5.0 Stretch amd64</distro>
   <url>https://app.vagrantup.com/secgen/boxes/debian_stretch_desktop_kde/versions/1.1/providers/virtualbox.box</url>
-  <ovirt_template>debian_stretch_desktop_kde_231018</ovirt_template>
+  <ovirt_template>debian_stretch_desktop_kde</ovirt_template>
 
   <reference>https://atlas.hashicorp.com/puppetlabs</reference>
   <software_license>various</software_license>
diff --git a/modules/bases/kali_light_msf/secgen_metadata.xml b/modules/bases/kali_light_msf/secgen_metadata.xml
index 7746f181c..38bebbd57 100644
--- a/modules/bases/kali_light_msf/secgen_metadata.xml
+++ b/modules/bases/kali_light_msf/secgen_metadata.xml
@@ -15,7 +15,7 @@
   <platform>unix</platform>
   <distro>Kali Linux 2018.3</distro>
   <url>https://app.vagrantup.com/secgen/boxes/kali_light_msf/versions/1.0/providers/virtualbox.box</url>
-  <ovirt_template>kali_linux_msf_241018</ovirt_template>
+  <ovirt_template>kali_linux_msf</ovirt_template>
 
   <reference>https://app.vagrantup.com/secgen</reference>
   <software_license>various</software_license>