diff --git a/code_generation/analysis_template.cxx b/code_generation/analysis_template.cxx
index 68a312e9..990f2939 100644
--- a/code_generation/analysis_template.cxx
+++ b/code_generation/analysis_template.cxx
@@ -85,8 +85,8 @@ int main(int argc, char *argv[]) {
     for (int i = 2; i < argc; i++) {
         input_files.push_back(std::string(argv[i]));
         // Check if the input file exists and is readable, also get the number
-        // of events, using a timeout of 30 seconds
-        TFile *f1 = TFile::Open(argv[i], "TIMEOUT=30");
+        // of events, using a timeout of 120 seconds
+        TFile *f1 = TFile::Open(argv[i], "TIMEOUT=120");
         if (!f1 || f1->IsZombie()) {
             Logger::get("main")->critical("File {} does not exist or is not "
                                           "readable",
diff --git a/code_generation/analysis_template_friends.cxx b/code_generation/analysis_template_friends.cxx
index 1a4b3de4..1b1615d8 100644
--- a/code_generation/analysis_template_friends.cxx
+++ b/code_generation/analysis_template_friends.cxx
@@ -49,7 +49,7 @@ namespace ROOTLogNS = ROOT::Experimental;
 
 int validate_rootfile(std::string file, std::string &basetree) {
     int nevents = 0;
-    TFile *f1 = TFile::Open(file.c_str(), "TIMEOUT=30");
+    TFile *f1 = TFile::Open(file.c_str(), "TIMEOUT=120");
     if (!f1 || f1->IsZombie()) {
         Logger::get("main")->critical("File {} does not exist or is not "
                                       "readable",
diff --git a/docs/sphinx_source/kingmaker.rst b/docs/sphinx_source/kingmaker.rst
index 6fe03583..434d678e 100644
--- a/docs/sphinx_source/kingmaker.rst
+++ b/docs/sphinx_source/kingmaker.rst
@@ -194,7 +194,7 @@ The different options are:
 - ``--config``: The config file to be used. The config file contains the information about all producers, parameters and output branches that are needed to run the ntuple production of your analysis. The config file is located in the ``CROWN/analysis_configurations/<analysis>/`` folder.
 - ``--production-tag``: The production tag is used to identify the production (default: ``default/<timestamp>``). It is used to create the output folder and the output files. The output files are stored in the ``/<base>/<production-tag>/CROWNRun/`` folder. The ``base`` variable is set using the Configuration. By default, it is set to ``root://cmsdcache-kit-disk.gridka.de//store/user/${USER}/CROWN/ntuples/``. Within the ``CROWNRun`` folder, the different samples are stored, matching the ``<era>/<samplenick>/<channel>/<samplenick>_<counter>.root`` pattern.
 - ``--sample-list``: The sample list to be used. The sample list can be generated by the ``sample_manager`` and contains the information about the samples to be processed. The sample nicks can also be provided as a comma-separated list.
-- ``--nanoAOD-version``: The NanoAOD version to be used. This should usually be the same version that was selected in the ``sample_manager`` step. (default: ``nanoAOD_v12``)
+- ``--nanoAOD-version``: The NanoAOD version to be used. This should usually be the same version that was selected in the ``sample_manager`` step. (default: ``nanoAOD_v15``)
 - ``--scopes``: The scopes to be used, provided as a comma-separated list (default: ``mt,et``).
 - ``--shifts``: The shifts to be used, provided as a comma-separated list (default: ``None``). If this parameter is not set, no shifts are applied. If ``All`` is provided, all shifts are applied, if ``None`` is provided, no shifts are applied.
 - ``--workers``: The number of workers to be used (default: ``1``). Each worker is responsible for the submission and handling of one sample. The number of workers should be at least the number of samples. If it is lower only the given number of samples will be processed at the same time and the additional samples will only be submitted when one of the already submitted samples is finished.
diff --git a/init.sh b/init.sh
index 2f1fed0e..9701be2c 100644
--- a/init.sh
+++ b/init.sh
@@ -144,6 +144,7 @@ action() {
             -B /etc/grid-security/certificates \
             -B "${GIT_ROOT}:${GIT_ROOT}" \
             -B "${HOME}:${HOME}" \
+            -B /cvmfs:/cvmfs \
             "${CONTAINER}" \
             bash -c "${INT_CMD}"
     fi