diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7743261..93c9040 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ test:
   - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
   - docker images
   tags:
-  - docker-armv7l
+  - docker
   only:
   - debug
 
@@ -38,6 +38,6 @@ build:
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
   - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
-  - docker-armv7l
+  - docker
   only:
-  - armv7l
+  - x86_64
diff --git a/Dockerfile b/Dockerfile
index 7f70556..edfeff5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # NAME leenooks/mysticbbs
-# VERSION 1.12a39-armv7l
+# VERSION 1.12a39-x86_64
 
-FROM arm32v7/debian:jessie-slim
+FROM debian:jessie-slim
 
 MAINTAINER Deon George <deon@leenooks.net>
 
@@ -13,7 +13,7 @@ RUN apt-get update \
 # 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/lib/x86_64-linux-gnu/libhunspell-1.3.so /usr/lib/libhunspell.so
 
 RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
 
diff --git a/README.md b/README.md
index 43c1742..545578a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ To use this container:
 
 1. Docker pull it from my registry. (Actually you can skip this step, but its worth doing it anyway!)
 
-        docker pull registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l
+        docker pull registry.leenooks.net/leenooks/mysticbbs:1.12a39-x86_64
 
 2. Create a directory to hold your BBS data. (I use */srv/docker/mystic*).
 
@@ -27,7 +27,7 @@ To use this container:
 
 3. Start the container.
 
-        docker run -itd -v /srv/mystic/data:/mystic/data -p 10022:22 -p 10023:23 -p 24554:24554 registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l
+        docker run -itd -v /srv/mystic/data:/mystic/data -p 10022:22 -p 10023:23 -p 24554:24554 registry.leenooks.net/leenooks/mysticbbs:1.12a39-x86_64
 
     Explanation of these parameters:
 
@@ -64,4 +64,4 @@ 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 [armv7l-extras](https://dev.leenooks.net/leenooks/mysticbbs/blob/armv7l-extras/README.md) branch.
+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) branch.
diff --git a/cleaninstall/.gitignore b/cleaninstall/.gitignore
index dbb32b1..e2d371d 100644
--- a/cleaninstall/.gitignore
+++ b/cleaninstall/.gitignore
@@ -2,3 +2,4 @@ data
 mystic
 mods
 *.zip
+*.rar
diff --git a/cleaninstall/cleaninstall.sh b/cleaninstall/cleaninstall.sh
index d72289e..440424e 100755
--- a/cleaninstall/cleaninstall.sh
+++ b/cleaninstall/cleaninstall.sh
@@ -2,13 +2,13 @@
 
 set -e
 
-MYSTIC_SOURCE=${1:-mys112a39_pi.zip}
+MYSTIC_SOURCE=${1:-mys112a39_l64.rar}
 [ "$1" ] && shift
 SPELL_SOURCE=${1:-mystic_spellcheck_v2.zip}
 [ "$1" ] && shift
 
 CLEAN_INSTALL_DIR=x
-INSTALL_CONTAINER=arm32v7/debian:jessie-slim
+INSTALL_CONTAINER=debian:jessie-slim
 TARGET_DIR=mystic
 PATCH_FILE=mystic.112a39.patch
 
@@ -24,8 +24,8 @@ else
 	# 2) Create a new directory for it and unzip the App into it
 	[ -d ${CLEAN_INSTALL_DIR} ] && echo "ERROR: Directory [${CLEAN_INSTALL_DIR}] already exists!" && exit 1
 
-	unzip ${MYSTIC_SOURCE} -d ${CLEAN_INSTALL_DIR}
-	[ $? -gt 0 ] && echo "ERROR: Unzip failed?" && exit 1
+	mkdir ${CLEAN_INSTALL_DIR}; cd ${CLEAN_INSTALL_DIR}; unrar x ../${MYSTIC_SOURCE}; cd ..
+	[ $? -gt 0 ] && echo "ERROR: Unrar failed?" && exit 1
 
 	# 3) Run docker with -v mapping the unzip files to an arbitrary directory -v unzipfiles:/install
 	# ** @TODO Request upstream to default QWK and Echo DIRs to named dir  as well during installation
diff --git a/libcl.so.3.4.3 b/libcl.so.3.4.3
index 731b2e6..319cfd2 100644
Binary files a/libcl.so.3.4.3 and b/libcl.so.3.4.3 differ
diff --git a/mystic.tar.gz b/mystic.tar.gz
index 25bd950..cde9733 100644
Binary files a/mystic.tar.gz and b/mystic.tar.gz differ