diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8aeccd..505e380 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,19 @@
-services:
-- ${CI_REGISTRY}/leenooks/ci-docker:dind
-
 stages:
-  - build
-  - test
-  - docker
+- build
+- test
+- docker
 
 # For some reason compiling on CentOS 6.x results in buffer corruption
 build:6-7.1:
   stage: build
   image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
   script:
-    - make -f Makefile.linux64
+  - make -f Makefile.linux64
   only:
-    - c6
+  - c6
   tags:
-    - C
+  - C
+  - x86_64
   artifacts:
     name: "$CI_BUILD_NAME"
     paths:
@@ -25,24 +23,26 @@ test:6-7.1:
   stage: test
   image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
   dependencies:
-    - build:6-7.1
+  - build:6-7.1
   script:
-    - cd test && ./test.sh
+  - cd test && ./test.sh
   only:
-    - c6
+  - c6
   tags:
-    - C
+  - C
+  - x86_64
 
 # Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption
 build:7-8.1:
   stage: build
   image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
   script:
-    - make -f Makefile.linux64
+  - make -f Makefile.linux64
   only:
-    - master
+  - master
   tags:
-    - C
+  - C
+  - x86_64
   artifacts:
     name: "$CI_BUILD_NAME"
     paths:
@@ -52,13 +52,14 @@ test:7-8.1:
   stage: test
   image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
   dependencies:
-    - build:7-8.1
+  - build:7-8.1
   script:
-    - cd test && ./test.sh
+  - cd test && ./test.sh
   only:
-    - master
+  - master
   tags:
-    - C
+  - C
+  - x86_64
   artifacts:
     name: "$CI_BUILD_NAME"
     paths:
@@ -67,16 +68,19 @@ test:7-8.1:
 docker:7-8.1:
   stage: docker
   image: docker:latest
+  services:
+  - docker:dind
+
   before_script:
   - docker info
   - docker version
   - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
   variables:
     CACHETAG: build
-    VERSION: 8.1.4
-    DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
+    VERSION: 8.1.7
+    DOCKER_HOST: tcp://docker:2375
   dependencies:
-    - test:7-8.1
+  - test:7-8.1
   script:
   - if [ -f init ]; then chmod 500 init; fi
   - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
@@ -86,5 +90,6 @@ docker:7-8.1:
   - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker
+  - x86_64
   only:
   - master
diff --git a/Dockerfile b/Dockerfile
index dbea9bb..be8c07b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # NAME deon/tsmpipe
-# VERSION 8.1.4
+# VERSION 8.1.7
 
 FROM centos:7
 
@@ -7,7 +7,7 @@ FROM centos:7
 #RUN SOURCE_URL=ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v812/8.1.2.0-TIV-TSMBAC-LinuxX86.tar \
 
 # If using PPA source
-RUN SOURCE_URL=http://yum.leenooks.net/docker/tsmba/8.1.4 \
+RUN SOURCE_URL=http://yum.leenooks.vpn/docker/tsm/8.x/SP_CLIENT_8.1.7_LIN86_ML.tar.gz \
 	&& PREFIX=TSMCLI_LNX/tsmcli/linux86 \
 	&& CHARS=$(echo ${PREFIX} | awk -F"/" '{print NF}') \
 	&& curl -SL ${SOURCE_URL} | tar -zC /tmp/ --strip-components ${CHARS} -xf - ${PREFIX}/gskcrypt64-*.linux.x86_64.rpm ${PREFIX}/gskssl64-*.linux.x86_64.rpm ${PREFIX}/TIVsm-API64.x86_64.rpm \