diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7
index 9c96bf0..fcc55c3 100644
--- a/opal-ci/Dockerfile-centos7
+++ b/opal-ci/Dockerfile-centos7
@@ -4,6 +4,8 @@ RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect va
 RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz
 RUN mkdir /opt/cross
 RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz
+RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm 
+RUN yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm
 COPY . /build/
 WORKDIR /build
 # We don't have a custom centos 7 build, same script for now
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index eac84b7..2fe4e09 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -1,6 +1,7 @@
 FROM fedora:rawhide
 RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
 RUN dnf -y install gcc-powerpc64-linux-gnu 
+RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm
 COPY . /build/
 WORKDIR /build
 ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-fedora24 b/opal-ci/Dockerfile-fedora24
index 83d31be..8110a2d 100644
--- a/opal-ci/Dockerfile-fedora24
+++ b/opal-ci/Dockerfile-fedora24
@@ -1,6 +1,7 @@
 FROM fedora:24
 RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
 RUN dnf -y install gcc-powerpc64-linux-gnu 
+RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm 
 COPY . /build/
 WORKDIR /build
 ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-fedora25 b/opal-ci/Dockerfile-fedora25
index fee18aa..eabb6e7 100644
--- a/opal-ci/Dockerfile-fedora25
+++ b/opal-ci/Dockerfile-fedora25
@@ -1,6 +1,7 @@
 FROM fedora:25
 RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
 RUN dnf -y install gcc-powerpc64-linux-gnu 
+RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm
 COPY . /build/
 WORKDIR /build
 ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04
index ff9c359..6bb6ded 100644
--- a/opal-ci/Dockerfile-ubuntu-12.04
+++ b/opal-ci/Dockerfile-ubuntu-12.04
@@ -12,6 +12,9 @@ RUN sudo mkdir /opt/cross
 RUN sudo tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz
 RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb
 RUN sudo dpkg -i systemsim-p8_1.0-2_amd64.deb
+RUN apt-get install -y libtcl8.6
+RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb
+RUN sudo dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb
 RUN sudo apt-get -y install eatmydata
 RUN sudo eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6
 COPY . /build/
diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04
index 2ed83cd..4f8a065 100644
--- a/opal-ci/Dockerfile-ubuntu-16.04
+++ b/opal-ci/Dockerfile-ubuntu-16.04
@@ -5,6 +5,9 @@ RUN apt-get install -y wget curl xterm
 RUN apt-get install -y gcc-arm-linux-gnueabi
 RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb
 RUN dpkg -i systemsim-p8_1.0-2_amd64.deb
+RUN apt-get install -y libtcl8.6
+RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb
+RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb
 RUN apt-get -y install eatmydata
 RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind
 COPY . /build/
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest
index fde86ec..4b7bfeb 100644
--- a/opal-ci/Dockerfile-ubuntu-latest
+++ b/opal-ci/Dockerfile-ubuntu-latest
@@ -5,6 +5,9 @@ RUN apt-get install -y wget xterm curl
 RUN apt-get install -y gcc-arm-linux-gnueabi
 RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb
 RUN dpkg -i systemsim-p8_1.0-2_amd64.deb
+RUN apt-get install -y libtcl8.6
+RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb
+RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb
 RUN apt-get -y install eatmydata
 RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind
 COPY . /build/
