diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a4b25b..ef1d1b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,7 @@ docker:7-8.1:
   - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
   variables:
     CACHETAG: build
-    VERSION: 8.1.0
+    VERSION: 8.1.4
     DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
   dependencies:
     - test:7-8.1
diff --git a/Dockerfile b/Dockerfile
index 6aa74f7..9c095dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,18 +3,21 @@
 
 FROM centos:7
 
+#RUN curl -SL ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v812/8.1.2.0-TIV-TSMBAC-LinuxX86.tar | tar -C /tmp/ -xf - gskcrypt64-8.0.50.78.linux.x86_64.rpm gskssl64-8.0.50.78.linux.x86_64.rpm TIVsm-API64.x86_64.rpm && yum install -y /tmp/*rpm && rm -f /tmp/*rpm /var/cache/yum
+
 RUN SOURCE_URL=http://yum.leenooks.net/docker/tsmba && \
 	PREFIX=TSMCLI_LNX/tsmcli/linux86 && \
 	CHARS=$(echo ${PREFIX} | awk -F"/" '{print NF}') && \
-	TSMPIPE=http://yum.leenooks.net/CentOS/7/ln/custom/tsmpipe-7.1.6_0_1.6.6-0.x86_64.rpm && \
 	curl -SL ${SOURCE_URL}/8.1.4 | tar -C /tmp/ --strip-components ${CHARS} -xzf - ${PREFIX}/gskcrypt64-*.linux.x86_64.rpm ${PREFIX}/gskssl64-*.linux.x86_64.rpm ${PREFIX}/TIVsm-API64.x86_64.rpm && \
-	yum install -y /tmp/*rpm ${TSMPIPE} && rm -rf /tmp/*rpm /var/cache/yum
+	yum install -y /tmp/*rpm && rm -rf /tmp/*rpm /var/cache/yum
 
 RUN ln -s /tsm/dsm.sys /opt/tivoli/tsm/client/api/bin64/ \
 	&& ln -s /tsm/dsm.opt /opt/tivoli/tsm/client/api/bin64/ \
 	&& ln -s /tsm/dsmcert.kdb /opt/tivoli/tsm/client/api/bin64/ \
 	&& ln -s /tsm/dsmcert.sth /opt/tivoli/tsm/client/api/bin64/
 
+COPY tsmpipe /usr/bin
+
 VOLUME [ "/tsm" ]
 
 # Starting