diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9eb5ea6..8061c84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,5 @@ before_script:
 - docker info
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-- ls -alR .
 
-include: .gitlab-docker-x86_64.yml
-#include: .gitlab-docker-armv7l.yml
+include: .gitlab-docker.yml
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
deleted file mode 100644
index 67d1cf4..0000000
--- a/.gitlab-docker-x86_64.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-x86_64:build:
-  variables:
-    ARCH: x86_64
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "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}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
-
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker.yml
similarity index 97%
rename from .gitlab-docker-armv7l.yml
rename to .gitlab-docker.yml
index 4f823cb..56465fe 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker.yml
@@ -13,4 +13,4 @@ armv7l:build:
   - docker
   - armv7l
   only:
-  - master
+  - armv7l
diff --git a/Dockerfile b/Dockerfile
index 9d3b0ac..dca4634 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,14 +23,6 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Other Utilities
-RUN echo "deb http://ftp.au.debian.org/debian/ stretch contrib" > /etc/apt/sources.list.d/contrib.list
-RUN apt-get update \
-    && apt-get install -yqq dosemu \
-    && apt-get -y autoremove \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
 # Build SBBS
 RUN apt-get update \
     && apt-get install -yqq build-essential libnspr4-dev libncurses5-dev libmozjs185-dev cvs wget pkgconf \