diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb098f96f7c96e99738171085bf17b6c180e78af..a7d3e13b6a12475ab33b46e97a00a7c6f53a1513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.1.8 - 05.15.19
+================
+
+* Bug fixes
+* Less constraints on the container_output validation
+
 1.1.7 - 04.09.19
 ================
 
diff --git a/diva_evaluation_cli/__init__.py b/diva_evaluation_cli/__init__.py
index 9910ac22e5d11c5359145fe4b57c235fdae08e66..f0be1393db141e4f2b6a7206a51a8736946c4e5a 100644
--- a/diva_evaluation_cli/__init__.py
+++ b/diva_evaluation_cli/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.7'
+__version__ = '1.1.8'
diff --git a/diva_evaluation_cli/bin/private_src/implementation/get_system/get/get_archive.sh b/diva_evaluation_cli/bin/private_src/implementation/get_system/get/get_archive.sh
index f5427cfc514726ec9fbe22c50c102d91d8c63b35..3708ec7b21ab2ced2786f41d5a23bfac495c0cd5 100755
--- a/diva_evaluation_cli/bin/private_src/implementation/get_system/get/get_archive.sh
+++ b/diva_evaluation_cli/bin/private_src/implementation/get_system/get/get_archive.sh
@@ -33,7 +33,7 @@ else
 fi
 
 archive=`ls`
-if [ $name != "" ]; then
+if [ $name == "" ]; then
   python3 -c "import shutil; shutil.unpack_archive('${archive}'); print('Archive uncompressed')"
 else
   python3 -c "import shutil; shutil.unpack_archive('${archive}', '${name}'); print('Archive uncompressed')"
diff --git a/diva_evaluation_cli/bin/private_src/implementation/validate_system/validate_system.py b/diva_evaluation_cli/bin/private_src/implementation/validate_system/validate_system.py
index e4da1b785e099e33c6d74468823ef4a541b8955c..5b6bbac8cc22a1c6ab7a0a4a3ec96b315f297dad 100644
--- a/diva_evaluation_cli/bin/private_src/implementation/validate_system/validate_system.py
+++ b/diva_evaluation_cli/bin/private_src/implementation/validate_system/validate_system.py
@@ -7,6 +7,7 @@ import importlib
 import logging
 import os
 import sys
+import glob
 
 root_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../../')
 
@@ -91,11 +92,11 @@ def validate_container_output():
     for dataset_id in os.listdir(container_output_dir):
         dataset_id_path = os.path.join(container_output_dir, dataset_id)
         if os.path.isdir(dataset_id_path):
-            files = os.listdir(dataset_id_path)
             content = import_expected_result('expected_container_output.txt')
             for file_name in content:
-                dataset_filename = dataset_id + '_' + file_name
-                if not dataset_filename in files:
+                dataset_filename =  '*' + file_name
+                files = os.path.join(dataset_id_path, dataset_filename)
+                if not glob.glob(files):
                     raise Exception("System validation failed, {} not present in {}".format(dataset_filename, dataset_id))
             logging.info("    .. {} is valid".format(dataset_id))
 
diff --git a/diva_evaluation_cli/src/implementation/init_experiment.sh b/diva_evaluation_cli/src/implementation/init_experiment.sh
index 5e2ae06b2493f3dfbd7b20980c1752bae051d349..0aa44fcf518c762cd8e2da3fa700d845ceabcc47 100755
--- a/diva_evaluation_cli/src/implementation/init_experiment.sh
+++ b/diva_evaluation_cli/src/implementation/init_experiment.sh
@@ -23,7 +23,6 @@ python3 get_videos.py $FILE_INDEX $TMP_FILE $FRAMES
 for CONTENT in $(cat $TMP_FILE); do
   VIDEO=`echo $CONTENT | cut -d ',' -f1`
   FRAMES_PATH=`echo $CONTENT | cut -d ',' -f2`
-
   mkdir -p "${FRAMES_PATH}"
   ffmpeg -i "${VIDEO_LOCATION}/${VIDEO}" "${FRAMES_PATH}/%05d.png"
 done
@@ -31,13 +30,14 @@ done
 rm $TMP_FILE
 
 # Start the rc3d container
-nvidia-docker run -itd --name rc3d \
-  -v ${FRAMES}:/data/diva/v1-frames \
+nvidia-docker  run -itd --name rc3d \
+  --entrypoint bash \
+  -v ${FRAMES}:/data/diva/frames \
   -v ${SYSTEM_CACHE_DIRECTORY}:/data/diva/system-cache \
-  gitlab.kitware.com:4567/diva-baseline/diva-baseline:eval_cli 
+  gitlab.kitware.com:4567/kwiver/r-c3d/eval-cli:phase2
 
-nvidia-docker exec rc3d mkdir -p /data/diva/nist-json
-nvidia-docker cp ${FILE_INDEX} rc3d:/data/diva/nist-json/file-index.json 
-nvidia-docker cp ${ACTIVITY_INDEX} rc3d:/data/diva/nist-json/activity-index.json 
-nvidia-docker cp ${CHUNK} rc3d:/data/diva/nist-json/chunk.json
+nvidia-docker exec rc3d mkdir -p /diva/nist-json
+nvidia-docker cp ${FILE_INDEX} rc3d:/diva/nist-json/file-index.json
+nvidia-docker cp ${ACTIVITY_INDEX} rc3d:/diva/nist-json/activity-index.json
+nvidia-docker cp ${CHUNK} rc3d:/diva/nist-json/chunk.json
 
diff --git a/diva_evaluation_cli/src/implementation/process_chunk.sh b/diva_evaluation_cli/src/implementation/process_chunk.sh
index 6d4a3cbb7777f224762df2a4660fa85ab190dacb..1ef673ccb4d85d7d25eb49072f1bed2a5a54aa30 100755
--- a/diva_evaluation_cli/src/implementation/process_chunk.sh
+++ b/diva_evaluation_cli/src/implementation/process_chunk.sh
@@ -2,4 +2,6 @@
 
 CHUNK_ID=$1
 
-nvidia-docker exec rc3d /bin/bash -c "python /diva/R-C3D/experiments/virat/main_wrapper.py --exp /diva/R-C3D/experiments/virat/experiment.yml --skip_train --chunk_id=${CHUNK_ID}"
+nvidia-docker start rc3d
+
+nvidia-docker exec -it rc3d /bin/bash -c "python /diva/R-C3D/experiments/virat/main_wrapper.py --exp /diva/R-C3D/experiments/virat/experiment.yml --model_cfg /diva/R-C3D/experiments/virat/td_cnn_end2end.yml --skip_train --test-activity-index /diva/nist-json/activity-index.json --chunk_id=${CHUNK_ID}"
diff --git a/diva_evaluation_cli/src/implementation/setup.sh b/diva_evaluation_cli/src/implementation/setup.sh
index f25c28bf141601bdd8d4df260a77f19c75814e5f..46647ead19e9f02cfd09b9717c2f7d099ffc0773 100755
--- a/diva_evaluation_cli/src/implementation/setup.sh
+++ b/diva_evaluation_cli/src/implementation/setup.sh
@@ -81,4 +81,4 @@ else
 fi
 
 # Install diva-baseline docker image
-docker pull gitlab.kitware.com:4567/diva-baseline/diva-baseline:eval_cli
+docker pull gitlab.kitware.com:4567/kwiver/r-c3d/evali-cli:phase2