diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7743261..04ed89a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,8 @@ stages:
 - build
 
 variables:
-  VERSION: 1.12a39-${CI_COMMIT_REF_NAME}
+  SUFFIX: -extra
+  VERSION: 1.12a39-${CI_COMMIT_REF_NAME}${SUFFIX}
   CACHETAG: build-${CI_COMMIT_REF_NAME}
   DOCKER_HOST: tcp://docker:2375
 
@@ -36,8 +37,8 @@ build:
   - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
   - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  # docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker-armv7l
   only:
-  - armv7l
+  - /^armv7l-.*/
diff --git a/Dockerfile b/Dockerfile
index 7f70556..1e8b818 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,26 @@
 # NAME leenooks/mysticbbs
-# VERSION 1.12a39-armv7l
+# VERSION 1.12a39-armv7l-extras
 
-FROM arm32v7/debian:jessie-slim
+FROM registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l
 
-MAINTAINER Deon George <deon@leenooks.net>
+## Add Mystic Mods
+# Game DBLup - Double-Up! v1.0
+RUN SOURCE_URL=http://yum.leenooks.net/bbs/MysticBBS/mods && FILE=DBLUP10.ZIP && \
+	cd /tmp && \
+	curl -O ${SOURCE_URL}/${FILE} && \
+	unzip ${FILE} && \
+	cd /mystic/ && \
+	mv /tmp/sysop.txt docs/mod-dblup-1.0-sysop.txt && \
+	mv /tmp/doubleup.mps scripts/ && cd scripts && ./mplc doubleup.mps && \
+	rm -rf /tmp/**
 
-# Pre-requisites
-RUN apt-get update \
-	&& apt-get install -yqq unzip zip curl libhunspell-dev \
-	&& rm -rf /var/lib/apt/lists/* /tmp/*
-
-# For SSH connections and Spell
-ADD libcl.so.3.4.3 /usr/lib
-RUN ln -sf libcl.so.3.4.3 /usr/lib/libcl.so
-RUN ln -sf /usr/lib/arm-linux-gnueabihf/libhunspell-1.3.so.0 /usr/lib/libhunspell.so
-
-RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
-
-WORKDIR /mystic
-ENV mysticbbs /mystic/data
-EXPOSE 22 23 24554
-
-COPY init /sbin/init
-ENTRYPOINT [ "/sbin/init" ]
-CMD [ "start" ]
-
-ADD mystic.tar.gz /
-VOLUME ["/mystic/data"]
-
-# Add Mystic Mods
+# Utility BLAM - BBS List Admin Manager v2.1
+RUN SOURCE_URL=http://yum.leenooks.net/bbs/MysticBBS/mods && FILE=GYBLAM21.ZIP && \
+	cd /tmp && \
+	curl -O ${SOURCE_URL}/${FILE} && \
+	unzip ${FILE} && \
+	cd /mystic/ && \
+	mv /tmp/sysop.txt docs/mod-blam-2.1-sysop.txt && \
+	mv /tmp/gy-blam.ini docs/mod-blam-2.1-gy-blam.ini && \
+	mv /tmp/gy-blam.mps scripts/ && cd scripts && ./mplc gy-blam.mps && \
+	rm -rf /tmp/**