diff --git a/README b/README
index fa461341c6660c7a1b434007bbed053e8f16ebee..50485ee001307bdd31ab29474a7cfa2a5f55d522 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ AUTHOR
 
 VERSION
 
-    0.2.2
+    0.2.3
 
 LAST UPDATED
 
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
index e022df60714ad0c29e2e4bd0777cfdf7c69c431f..e08d4b8867965c675ac4e908770941fc9e6dc350 100644
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
@@ -256,7 +256,7 @@ OSVersion: xenial
     echo 'send "N\r"' >> install-tensorflow-python.exp
     echo 'expect "Do you wish to build TensorFlow with VERBS support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "N\r"' >> install-tensorflow-python.exp
-    echo 'expect "Do you wish to build TensorFlow with OpenCL support? \[y/N\]: "' >> install-tensorflow-python.exp
+    echo 'expect "Do you wish to build TensorFlow with OpenCL SYCL support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "N\r"' >> install-tensorflow-python.exp
     echo 'expect "Do you wish to build TensorFlow with CUDA support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "Y\r"' >> install-tensorflow-python.exp
@@ -323,7 +323,7 @@ OSVersion: xenial
     echo 'send "N\r"' >> install-tensorflow-python3.exp
     echo 'expect "Do you wish to build TensorFlow with VERBS support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "N\r"' >> install-tensorflow-python3.exp
-    echo 'expect "Do you wish to build TensorFlow with OpenCL support? \[y/N\]: "' >> install-tensorflow-python3.exp
+    echo 'expect "Do you wish to build TensorFlow with OpenCL SYCL support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "N\r"' >> install-tensorflow-python3.exp
     echo 'expect "Do you wish to build TensorFlow with CUDA support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "Y\r"' >> install-tensorflow-python3.exp
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def b/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
index af1236464e65512cbb1c58b2b0b44fd8d38fb844..ff4faf3301297003d2d007935deb06fc112d419f 100644
--- a/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180307
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,32 +73,7 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Set path to miniconda2 binary
     export PATH="/opt/miniconda2/bin:${PATH}"
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def b/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
index 9b5438948a475251b37cf18fe8588c8ea0f7d36b..5fb7b3d9e0c439eb261e0eafb8ec8014342fb730 100644
--- a/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180301
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,32 +73,7 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Set path to miniconda2 binary
     export PATH="/opt/miniconda2/bin:${PATH}"
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
index 02e967ec983ae244c389e2372d6ffc0a3f6cd07f..a27d6344be624618fcba6c0f81d19726c652259b 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180316
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Location of NVIDIA repositories
     declare -r NVIDIA_ROOT_URL='http://developer.download.nvidia.com/compute'
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
index f513021d9c433e181b14fb114c6653f7951d920e..e907f3c5503ba2419d6b8c3524bc16677a7bd242 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Location of NVIDIA repositories
     declare -r NVIDIA_ROOT_URL='http://developer.download.nvidia.com/compute'
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
index 19abcf90d0f572683b1639b054718d42f4cc9573..aaecc640791aabce13b459e1fbe2fb3f2d52fa2a 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Install basic drivers for user space access to Ethernet, RDMA,
     # and Infiniband. See https://community.mellanox.com/docs/DOC-2431
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
index b2d3764b459591dde3528b265198a61de56a5319..17e9ab2272e97792c627cf82f5654bbf37e924bd 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Install basic drivers for user space access to Ethernet, RDMA,
     # and Infiniband. See https://community.mellanox.com/docs/DOC-2431
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
index efbc3dc504b8adc1a1fb3d83ccddef395e81a5b1..e4ccc66b9cc02f8ef46cf0687279f1de390d1957 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,63 +73,13 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
     
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
-
     # Set container environment variables
     cd /.singularity.d/env