diff --git a/build.gradle b/build.gradle
index 9500c50..1076aed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -422,7 +422,7 @@
         testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion,ext: "jar"
         testCompile group: "org.eclipse.virgo.mirrored", name: "org.mozilla.javascript", version: mozillaJavascriptVersion, configuration: "compile", ext: "jar"
         testCompile group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
-        testCompile group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.commons.io", version: commonsIoVersion, ext: "jar"
+        testCompile group: "commons-io", name: "commons-io", version: commonsIoVersion, ext: "jar"
 
         compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
         compile group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
@@ -434,7 +434,7 @@
 
         compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: 'jar'
 
-        compile group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.commons.fileupload", version: commonsFileuploadVersion, ext: "jar"
+        compile group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
         compile group: "org.jolokia", name: "jolokia-osgi", version: jolokiaVersion, ext: "jar"
     }
 }
diff --git a/org.eclipse.virgo.management.console/template.mf b/org.eclipse.virgo.management.console/template.mf
index f9d23ef..e001a3b 100644
--- a/org.eclipse.virgo.management.console/template.mf
+++ b/org.eclipse.virgo.management.console/template.mf
@@ -11,7 +11,7 @@
  org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
  org.jolokia.osgi.servlet;version="${jolokiaVersion:[=.=,+1.=)}",
  org.slf4j;version="${slf4jVersion:[=.=.=,+1)}",
- org.apache.commons.fileupload.*;version="0",
+ org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=,+1)}",
  org.eclipse.osgi.internal.signedcontent;version="0",
  org.osgi.framework.*;version="0",
  org.osgi.service.*;version="0",