diff --git a/hpc_install/build-wrapt.ys b/hpc_install/build-wrapt.ys
index feaf9d4..8d4e13c 100644
--- a/hpc_install/build-wrapt.ys
+++ b/hpc_install/build-wrapt.ys
@@ -8,11 +8,9 @@
 
 set -e
 
-PKG="wrapt"
-VERSION="1.10.10"
-PKGSRC=$PKG"-"$VERSION
+PKGSRC=$HPCI_SW_NAME"-"${HPCI_SW_VERSION}
 
-tar -xvf $PKGSRC".tar.gz" > /dev/null
+tar -xf $PKGSRC".tar.gz"
 cd $PKGSRC
 python setup.py build
 
@@ -36,13 +34,12 @@ local pytestpath = pathJoin(verpath, "lib/python2.7/site-packages/") -- internal
 prepend_path("PYTHONPATH", pytestpath)
 
 conflict("all-python-libs")
-prereq("python/2.7.7")
 EOF
 
 mkdir -p $HPCI_SW_DIR/lib/python2.7/site-packages/  # create the install directory (python does not install in not existing dirs)
 
 # Need to set pythonpath in order to dump the .pth files
-export PYTHONPATH=${HPCI_SW_DIR}/lib/python2.7/site-packages:$PYTHONPATH
+ml use $HPCI_MOD_DIR/pythonpkgs
+ml $HPCI_SW_NAME/${HPCI_SW_VERSION}
 
 python setup.py install --prefix=$HPCI_SW_DIR
-
diff --git a/hpc_install/build-wrf-python.ys b/hpc_install/build-wrf-python.ys
index 61d3ca6..2512222 100644
--- a/hpc_install/build-wrf-python.ys
+++ b/hpc_install/build-wrf-python.ys
@@ -6,14 +6,14 @@
 #HPCI -p gnu/4.8.2
 #HPCI -p python/2.7.7
 #HPCI -p numpy/1.11.0
+#HPCI -p wrapt/1.10.10
+#HPCI -p scipy/0.17.1 bottleneck/1.1.0 numexpr/2.6.0 pyside/1.1.2 matplotlib/1.5.1 pandas/0.18.1 netcdf4python/1.2.4 xarray/0.8.2
 
 set -e
 
-PKG="wrf-python"
-VERSION="1.0.1"
-PKGSRC=$PKG"-"$VERSION
+PKGSRC=$HPCI_SW_NAME"-"${HPCI_SW_VERSION}
 
-tar -xvf $PKGSRC".tar.gz" > /dev/null
+tar -xf $PKGSRC".tar.gz"
 cd $PKGSRC
 python setup.py build
 
@@ -33,22 +33,19 @@ See http://wrf-python.rtfd.org for details.
 ]])
 
 local verpath = "$HPCI_SW_DIR" -- specific version path
-local pytestpath = pathJoin(verpath, "lib/python2.7/site-packages/") -- internal python libs
+local pypath = pathJoin(verpath, "lib/python2.7/site-packages/") -- internal python libs
 
-prepend_path("PYTHONPATH", pytestpath)
+prepend_path("PYTHONPATH", pypath)
 
 conflict("all-python-libs")
-prereq("python/2.7.7")
-prereq("numpy/1.11.0")
-prereq("wrapt/1.10.10")
-prereq("xarray/0.8.2")
-
+prereq($HPCI_MOD_PREREQ)
 EOF
 
 mkdir -p $HPCI_SW_DIR/lib/python2.7/site-packages/  # create the install directory (python does not install in not existing dirs)
 
 # Need to set pythonpath in order to dump the .pth files
-export PYTHONPATH=${HPCI_SW_DIR}/lib/python2.7/site-packages:$PYTHONPATH
+ml use $HPCI_MOD_DIR/pythonpkgs
+ml $HPCI_SW_NAME/${HPCI_SW_VERSION}
 
 python setup.py install --prefix=$HPCI_SW_DIR