diff --git a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
index 4bac768e..11ee530a 100644
--- a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
+++ b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
@@ -38,6 +38,6 @@ dependencies = [
 prebuildopts = 'for NAME in `find -name link.txt`; do cp $NAME $NAME.old; sed -e "s/libcholmod.a/libcholmod.a -lmetis -lcamd -lccolamd/g" $NAME.old | tee $NAME; done &&'
 
 # too parallel is too slow, and may cause build/tests to fail
-maxparallel = 8
+maxparallel = 16
 
 moduleclass = 'numlib'
diff --git a/v/VTune/VTune-2013_update10.eb b/v/VTune/VTune-2013_update10.eb
deleted file mode 100644
index b91469e4..00000000
--- a/v/VTune/VTune-2013_update10.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update10'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2013_update11.eb b/v/VTune/VTune-2013_update11.eb
deleted file mode 100644
index 40e7c53f..00000000
--- a/v/VTune/VTune-2013_update11.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update11'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2013_update12.eb b/v/VTune/VTune-2013_update12.eb
deleted file mode 100644
index 90c29f25..00000000
--- a/v/VTune/VTune-2013_update12.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update12'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2013_update6.eb b/v/VTune/VTune-2013_update6.eb
deleted file mode 100644
index 12218680..00000000
--- a/v/VTune/VTune-2013_update6.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update6'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2013_update8.eb b/v/VTune/VTune-2013_update8.eb
deleted file mode 100644
index b459f6bc..00000000
--- a/v/VTune/VTune-2013_update8.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update8'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2013_update9.eb b/v/VTune/VTune-2013_update9.eb
deleted file mode 100644
index fdef18b8..00000000
--- a/v/VTune/VTune-2013_update9.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2013_update9'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2016_update3.eb b/v/VTune/VTune-2016_update3.eb
deleted file mode 100644
index dd2608b9..00000000
--- a/v/VTune/VTune-2016_update3.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2016_update3'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2017.eb b/v/VTune/VTune-2017.eb
deleted file mode 100644
index 963b3026..00000000
--- a/v/VTune/VTune-2017.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-name = 'VTune'
-version = '2017'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2017_update1.eb b/v/VTune/VTune-2017_update1.eb
deleted file mode 100644
index 5177101e..00000000
--- a/v/VTune/VTune-2017_update1.eb
+++ /dev/null
@@ -1,16 +0,0 @@
-name = 'VTune'
-version = '2017_update1'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-checksums = ['c3524d972072780023c3839b1188baaa']
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2017_update2.eb b/v/VTune/VTune-2017_update2.eb
deleted file mode 100644
index 274c4ac3..00000000
--- a/v/VTune/VTune-2017_update2.eb
+++ /dev/null
@@ -1,15 +0,0 @@
-name = 'VTune'
-version = '2017_update2'
-
-homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = {'name': 'dummy', 'version': 'dummy'}
-
-sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
-checksums = ['1ef91898e107a1da015305def80091e4']
-
-license_file = '/apps/licenses/intel/license.lic'
-
-moduleclass = 'tools'
diff --git a/v/VTune/VTune-2017_update4.eb b/v/VTune/VTune-2017_update4.eb
new file mode 100644
index 00000000..97a6a6ba
--- /dev/null
+++ b/v/VTune/VTune-2017_update4.eb
@@ -0,0 +1,28 @@
+name = 'VTune'
+version = '2017_update4'
+
+homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
+description = "Intel VTune Amplifier XE 2016 is the premier performance profiler for C, C++, C#, Fortran, Assembly and Java."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+license_file = '/apps/licenses/intel/license.lic'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['vtune_amplifier_xe_2017.4.0.518798', 'modules'],
+}
+
+# Do necessary post-install steps to build VTune kernel modules
+postinstallcmds = [
+    'mkdir %(installdir)s/modules',
+    'cd %(installdir)s/vtune_amplifier_xe/sepdk/src/ && '
+    './build-driver --install-dir=%(installdir)s/modules --non-interactive',
+]
+
+moduleclass = 'tools'