diff --git a/lib/batch/batch_secgen.rb b/lib/batch/batch_secgen.rb
index 5e9a2c1d6..56ce73ce5 100644
--- a/lib/batch/batch_secgen.rb
+++ b/lib/batch/batch_secgen.rb
@@ -119,7 +119,7 @@ def get_delete_opts
 end
 
 def parse_opts(opts)
-  options = {:instances => '', :max_threads => 5, :id => nil, :all => false}
+  options = {:instances => '', :max_threads => 2, :id => nil, :all => false}
   opts.each do |opt, arg|
     case opt
       when '--instances'
diff --git a/modules/services/unix/http/tomcat/secgen_metadata.xml b/modules/services/unix/http/tomcat/secgen_metadata.xml
index 3a92b4b44..2eedbf3bd 100644
--- a/modules/services/unix/http/tomcat/secgen_metadata.xml
+++ b/modules/services/unix/http/tomcat/secgen_metadata.xml
@@ -9,7 +9,7 @@
   <module_license>Apache v2</module_license>
   <description>Puppetlabs Apache Tomcat module</description>
 
-  <type>httpd</type>
+  <type>servlet</type>
   <type>tomcat</type>
   <platform>linux</platform>
 
@@ -28,4 +28,4 @@
   <requires>
     <type>java</type>
   </requires>
-</service>
\ No newline at end of file
+</service>
diff --git a/modules/utilities/unix/hackerbot/secgen_metadata.xml b/modules/utilities/unix/hackerbot/secgen_metadata.xml
index eeca75d2a..b4af833df 100644
--- a/modules/utilities/unix/hackerbot/secgen_metadata.xml
+++ b/modules/utilities/unix/hackerbot/secgen_metadata.xml
@@ -36,6 +36,6 @@
     <type>update</type>
   </requires>
   <requires>
-    <type>httpd</type>
+    <type>.*/apache.*</type>
   </requires>
 </utility>
diff --git a/secgen.rb b/secgen.rb
index d7cf6df64..f41ddc35e 100644
--- a/secgen.rb
+++ b/secgen.rb
@@ -134,7 +134,7 @@ def build_vms(scenario, project_dir, options, systems)
   end
 
   # if deploying to ovirt, when things fail to build, set the retry_count
-  retry_count = OVirtFunctions::provider_ovirt?(options) ? 1 : 0  # TODO: Reset to 10 before merging
+  retry_count = OVirtFunctions::provider_ovirt?(options) ? 5 : 0  # TODO: Reset to 10 before merging
   successful_creation = false
 
   while retry_count and !successful_creation