diff --git a/containers/singularity/eic.def b/containers/singularity/eic.def
index 4121591e05bf880290b703865f734859d7398ba9..b588a2e19b3d8568401a3182431a62d2f59726a2 100644
--- a/containers/singularity/eic.def
+++ b/containers/singularity/eic.def
@@ -44,161 +44,161 @@ From: eicweb.phy.anl.gov:4567/containers/eic_container/eic_container:latest
 # ===================================
 # ddsim
 # ===================================
-%apprun ddsim
-  . /usr/local/bin/thisdd4hep.sh
-  ddsim "%@"
-
-%appenv ddsim
-  export PYTHONPATH=/usr/local/lib:$PYTHONPATH
-  export PATH=/usr/loca/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# ddeve
-# =======================
-%apprun ddeve
-  . /usr/local/bin/thisdd4hep.sh
-  ddeve "$@"
-
-%appenv ddeve
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# root
-# =======================
-%apprun root
-  . /usr/local/bin/thisdd4hep.sh
-  root "$@"
-
-%appenv root
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-  export EPICS_ROOT=/usr/local/epics
-  export EPICS_BASE=/usr/local/epics/base
-  export EPICS_HOST_ARCH=linux-x86_64
-  export PATH=$EPICS_ROOT/bin:$PATH
-  export LD_LIBRARY_PATH=$EPICS_ROOT/lib:$LD_LIBRARY_PATH
-  export PATH=$EPICS_BASE/bin/$EPICS_HOST_ARCH:$PATH
-  export LD_LIBRARY_PATH=$EPICS_BASE/lib/$EPICS_HOST_ARCH:$LD_LIBRARY_PATH
-
-# =======================
-# root-config
-# =======================
-%apprun root-config
-  . /usr/local/bin/thisdd4hep.sh
-  root-config "$@"
-
-%appenv root-config
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-
-# =======================
-# rootbrowse
-# =======================
-%apprun rootbrowse
-  . /usr/local/bin/thisdd4hep.sh
-  rootbrowse "$@"
-
-%appenv rootbrowse
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# rootls
-# =======================
-%apprun rootls
-  . /usr/local/bin/thisdd4hep.sh
-  rootls "$@"
-
-%appenv rootls
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# hadd
-# =======================
-%apprun hadd
-  . /usr/local/bin/thisdd4hep.sh
-  hadd "$@"
-
-%appenv hadd
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# h2root
-# =======================
-%apprun h2root
-  . /usr/local/bin/thisdd4hep.sh
-  h2root "$@"
-
-%appenv h2root
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# xml2evio
-# =======================
-%apprun xml2evio
-  . /usr/local/bin/thisdd4hep.sh
-  xml2evio "$@"
-
-%appenv xml2evio
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# evio2xml
-# =======================
-%apprun evio2xml
-  evio2xml "$@"
-
-%appenv evio2xml
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# evioCat
-# =======================
-%apprun evioCat
-  . /usr/local/bin/thisdd4hep.sh
-  evioCat "$@"
-
-%appenv evioCat
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
-
-# =======================
-# eviocopy
-# =======================
-%apprun eviocopy
-  eviocopy "$@"
-
-%appenv eviocopy
-  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
-  export PATH=/usr/local/bin:${PATH}
-  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-  export ROOT_INCLUDE_PATH=/usr/local/include
+#%apprun ddsim
+#  . /usr/local/bin/thisdd4hep.sh
+#  ddsim "%@"
+#
+#%appenv ddsim
+#  export PYTHONPATH=/usr/local/lib:$PYTHONPATH
+#  export PATH=/usr/loca/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## ddeve
+## =======================
+#%apprun ddeve
+#  . /usr/local/bin/thisdd4hep.sh
+#  ddeve "$@"
+#
+#%appenv ddeve
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## root
+## =======================
+#%apprun root
+#  . /usr/local/bin/thisdd4hep.sh
+#  root "$@"
+#
+#%appenv root
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#  export EPICS_ROOT=/usr/local/epics
+#  export EPICS_BASE=/usr/local/epics/base
+#  export EPICS_HOST_ARCH=linux-x86_64
+#  export PATH=$EPICS_ROOT/bin:$PATH
+#  export LD_LIBRARY_PATH=$EPICS_ROOT/lib:$LD_LIBRARY_PATH
+#  export PATH=$EPICS_BASE/bin/$EPICS_HOST_ARCH:$PATH
+#  export LD_LIBRARY_PATH=$EPICS_BASE/lib/$EPICS_HOST_ARCH:$LD_LIBRARY_PATH
+#
+## =======================
+## root-config
+## =======================
+#%apprun root-config
+#  . /usr/local/bin/thisdd4hep.sh
+#  root-config "$@"
+#
+#%appenv root-config
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+#
+## =======================
+## rootbrowse
+## =======================
+#%apprun rootbrowse
+#  . /usr/local/bin/thisdd4hep.sh
+#  rootbrowse "$@"
+#
+#%appenv rootbrowse
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## rootls
+## =======================
+#%apprun rootls
+#  . /usr/local/bin/thisdd4hep.sh
+#  rootls "$@"
+#
+#%appenv rootls
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## hadd
+## =======================
+#%apprun hadd
+#  . /usr/local/bin/thisdd4hep.sh
+#  hadd "$@"
+#
+#%appenv hadd
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## h2root
+## =======================
+#%apprun h2root
+#  . /usr/local/bin/thisdd4hep.sh
+#  h2root "$@"
+#
+#%appenv h2root
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## xml2evio
+## =======================
+#%apprun xml2evio
+#  . /usr/local/bin/thisdd4hep.sh
+#  xml2evio "$@"
+#
+#%appenv xml2evio
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## evio2xml
+## =======================
+#%apprun evio2xml
+#  evio2xml "$@"
+#
+#%appenv evio2xml
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## evioCat
+## =======================
+#%apprun evioCat
+#  . /usr/local/bin/thisdd4hep.sh
+#  evioCat "$@"
+#
+#%appenv evioCat
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include
+#
+## =======================
+## eviocopy
+## =======================
+#%apprun eviocopy
+#  eviocopy "$@"
+#
+#%appenv eviocopy
+#  export PYTHONPATH=/usr/local/lib:${PYTHONPATH}
+#  export PATH=/usr/local/bin:${PATH}
+#  export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+#  export ROOT_INCLUDE_PATH=/usr/local/include