diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt
index bae9503..720b92c 100644
--- a/docker/CMakeLists.txt
+++ b/docker/CMakeLists.txt
@@ -1,31 +1,28 @@
 # create directories to build docker images
 
 # These images are mainly created to build, and test specmicp with
 # different configurations
 
 # It also helps with the listing of the requirements
 
 set(list_docker_images
 
     debian-stretch
     fedora-23
+    fedora-26
     )
 
 
 add_custom_target(docker_include
     SOURCES
-    run_tests.sh
     #--
     debian-stretch/Dockerfile
+    debian-stretch/run_tests.sh
     #--
     fedora-23/Dockerfile
-
-    )
-
-foreach(image ${list_docker_images})
-    file(COPY
-        ${image}/Dockerfile
-        run_tests.sh
-        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${image}
-        )
-endforeach(image)
+    fedora-23/run_tests.sh
+    #--
+    fedora-26/Dockerfile
+    fedora-26/run_tests.sh
+    #--
+)
diff --git a/docker/debian-stretch/Dockerfile b/docker/debian-stretch/Dockerfile
index 6fd770c..56679b1 100644
--- a/docker/debian-stretch/Dockerfile
+++ b/docker/debian-stretch/Dockerfile
@@ -1,21 +1,25 @@
 # specmicp test image
 FROM debian:stretch
 MAINTAINER Fabien Georget <fabieng@princeton.edu>
 RUN apt-get update && apt-get install -y \
     g++ \
     git \
     cmake \
     libeigen3-dev \
     libboost-dev \
-    libyaml-cpp0.5v5 \
-    libyaml-cpp-dev \
-    libhdf5-10 \
+    libhdf5-100 \
     libhdf5-dev
+    #libyaml-cpp0.5v5 \
+    #libyaml-cpp-dev \
 
 RUN useradd -ms /bin/bash specmicp
 
 COPY run_tests.sh /home/specmicp/run_tests.sh
 RUN chown specmicp /home/specmicp/run_tests.sh && chmod +x /home/specmicp/run_tests.sh
 
+RUN git clone https://github.com/jbeder/yaml-cpp.git
+RUN cd yaml-cpp && mkdir build && cd build && cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/yaml-cpp -DBUILD_SHARED_LIBS=ON && make install
+
+
 USER specmicp
 WORKDIR /home/specmicp
diff --git a/docker/run_tests.sh b/docker/debian-stretch/run_tests.sh
similarity index 64%
copy from docker/run_tests.sh
copy to docker/debian-stretch/run_tests.sh
index b879c05..71f8555 100644
--- a/docker/run_tests.sh
+++ b/docker/debian-stretch/run_tests.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+export PKG_CONFIG_PATH=/opt/yaml-cpp/lib/pkgconfig
+
 git clone https://bitbucket.org/specmicp/specmicp
 cd specmicp
 mkdir build && cd build
-cmake ../
+cmake ../ 
 make && ctest
diff --git a/docker/run_tests.sh b/docker/fedora-23/run_tests.sh
similarity index 100%
copy from docker/run_tests.sh
copy to docker/fedora-23/run_tests.sh
diff --git a/docker/debian-stretch/Dockerfile b/docker/fedora-26/Dockerfile
similarity index 53%
copy from docker/debian-stretch/Dockerfile
copy to docker/fedora-26/Dockerfile
index 6fd770c..19bf341 100644
--- a/docker/debian-stretch/Dockerfile
+++ b/docker/fedora-26/Dockerfile
@@ -1,21 +1,25 @@
-# specmicp test image
-FROM debian:stretch
+# specmicp test image using fedora 23 as base
+FROM fedora:26
 MAINTAINER Fabien Georget <fabieng@princeton.edu>
-RUN apt-get update && apt-get install -y \
-    g++ \
+RUN dnf install -y \
+    gcc \
+    gcc-c++ \
+    libstdc++ \
+    libstdc++-devel \
+    make \
     git \
     cmake \
-    libeigen3-dev \
-    libboost-dev \
-    libyaml-cpp0.5v5 \
-    libyaml-cpp-dev \
-    libhdf5-10 \
-    libhdf5-dev
+    eigen3 \
+    boost \
+    yaml-cpp \
+    yaml-cpp-devel \
+    hdf5 \
+    hdf5-devel
 
 RUN useradd -ms /bin/bash specmicp
 
 COPY run_tests.sh /home/specmicp/run_tests.sh
 RUN chown specmicp /home/specmicp/run_tests.sh && chmod +x /home/specmicp/run_tests.sh
 
 USER specmicp
 WORKDIR /home/specmicp
diff --git a/docker/run_tests.sh b/docker/fedora-26/run_tests.sh
similarity index 100%
rename from docker/run_tests.sh
rename to docker/fedora-26/run_tests.sh