diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93c9040..12176ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,11 +33,11 @@ build:
   stage: build
   script:
   - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+  # 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
   only:
-  - x86_64
+  - /^x86_64-.*/
diff --git a/Dockerfile b/Dockerfile
index aab4519..cb2e09c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,26 @@
 # NAME leenooks/mysticbbs
-# VERSION 1.12a39-x86_64
+# VERSION 1.12a39-x86_64-extras
 
-FROM debian:stretch-slim
+FROM registry.leenooks.net/leenooks/mysticbbs:1.12a39-x86_64
 
-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/x86_64-linux-gnu/libhunspell-1.3.so /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/**
diff --git a/README.md b/README.md
index 098954e..e7b785d 100644
--- a/README.md
+++ b/README.md
@@ -63,5 +63,16 @@ If you want to monitor your container, or stop it, attach to the console with:
 You can also run this in a swarm (I do)!
 
 ----
-## Extras Container
-There is an "extras" container with some additional MysticBBS mods pre-installed. You'll find info on that in the [x86_64-extras](https://dev.leenooks.net/leenooks/mysticbbs/blob/x86_64-extras/README.md#info-on-the-images) branch.
+## Info on the Images
+
+### leenooks/mysticbbs:1.12a39-armv7l (Branch: armv7l)
+This image is a clean install of Mystic BBS v1.12a39. It is ready for you to configure and personalise.
+
+### leenooks/mysticbbs:1.12a39-armv7l-extras (Branch: armv7l-extras)
+This image is based on the above image, with the follow additional games/tools installed. You'll need to refer to the documentation in the docs/ directory (inside the container) for details on how to configure these mods. The docs are named `mod-<NAME OF MOD>-...`
+
+| Category | Name | Description |
+| :- | :- | :- |
+| Game | Double Up | Double Up! for Mystic V1.0 by Darryl Perry |
+| Utility | BLAM | BBS List Admin Manager for Mystic v2.0 by Darryl Perry |
+
diff --git a/libcl.so.3.4.3 b/libcl.so.3.4.3
deleted file mode 100644
index c1697dc..0000000
Binary files a/libcl.so.3.4.3 and /dev/null differ
diff --git a/mystic.tar.gz b/mystic.tar.gz
deleted file mode 100644
index cde9733..0000000
Binary files a/mystic.tar.gz and /dev/null differ