diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp
index 83bd4c43c..288a4208c 100644
--- a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp
+++ b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp
@@ -3,7 +3,7 @@ class gitlist_040::apache {
   $port = $secgen_parameters['port'][0]
   $docroot = '/var/www/gitlist'
 
-  package { 'php5':
+  package { 'php':
     ensure => installed,
   }
   #
diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
index 93c6c72d8..9273d7539 100644
--- a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
@@ -49,12 +49,12 @@
   <msf_module>exploit/linux/http/gitlist_exec</msf_module>
   <hint>Visit the webapp in a browser at: ip:80/gitlist </hint>
 
-  <conflict>
-    <name>Stretch</name>
-  </conflict>
+  <!--<conflict>-->
+    <!--<name>Stretch</name>-->
+  <!--</conflict>-->
 
   <requires>
-    <module_path>.*apache</module_path>
+    <module_path>.*apache.*</module_path>
     <type>httpd</type>
   </requires>
 
diff --git a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
index c71fcfa6c..b588d6bd4 100644
--- a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
@@ -68,12 +68,12 @@
     Path traversal found in AttachFile module.
   </solution>
 
-  <conflict>
-    <name>Stretch</name>
-  </conflict>
+  <!--<conflict>-->
+    <!--<name>Stretch</name>-->
+  <!--</conflict>-->
 
   <requires>
-    <module_path>.*apache</module_path>
+    <module_path>.*apache.*</module_path>
     <type>httpd</type>
   </requires>
 
diff --git a/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml
index 729d57b72..4e5929412 100644
--- a/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml
@@ -144,7 +144,7 @@
   </requires>
 
   <requires>
-    <module_path>.*/mysql</module_path>
+    <module_path>.*/mysql_wheezy.*</module_path>
   </requires>
 
 </vulnerability>
diff --git a/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml b/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
index 1736a7a6a..8eeb3d9c0 100644
--- a/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>file_server</system_name>
-    <base platform="linux" type="server"/>
+    <base platform="linux" type="server" module_path=".*stretch.*"/>
 
     <vulnerability module_path=".*gitlist_040"/>
 
diff --git a/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml b/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
index 381133c7f..75b1279cf 100644
--- a/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
+++ b/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>file_server</system_name>
-    <base platform="linux" type="server"/>
+    <base platform="linux" type="server" module_path=".*stretch.*"/>
 
     <vulnerability module_path="vulnerabilities/unix/webapp/moinmoin_195"/>