diff --git a/Dockerfile b/Dockerfile
index b58b115bbb3491cece01128c64351d38f6390bde..c702f564ae6dd897e23da69c34920d6ffd6d2b01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,80 @@
-FROM lsiobase/bionic-root-x86
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=amd64
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"
 
 # set version for s6 overlay
-ARG OVERLAY_VERSION="v1.22.0.0"
+ARG OVERLAY_VERSION
 ARG OVERLAY_ARCH="amd64"
 
-# set environment variables
+# set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/root" \
 LANGUAGE="en_US.UTF-8" \
 LANG="en_US.UTF-8" \
 TERM="xterm"
 
-# copy sources
+# copy sources
 COPY sources.list /etc/apt/
 
 RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
  echo "**** install apt-utils and locales ****" && \
  apt-get update && \
  apt-get install -y \
@@ -27,6 +87,10 @@ RUN \
  echo "**** generate locale ****" && \
  locale-gen en_US.UTF-8 && \
  echo "**** add s6 overlay ****" && \
+ if [ -z ${OVERLAY_VERSION+x} ]; then \
+        OVERLAY_VERSION=$(curl -sX GET "https://api.github.com/repos/just-containers/s6-overlay/releases/latest" \
+        | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+ fi && \
  curl -o \
  /tmp/s6-overlay.tar.gz -L \
 	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
new file mode 100644
index 0000000000000000000000000000000000000000..ad0db098ed2219a8af579f732a1053265fc011f2
--- /dev/null
+++ b/Dockerfile.aarch64
@@ -0,0 +1,118 @@
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=arm64
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+# Add qemu to run on x86_64 systems
+COPY qemu-aarch64-static /usr/bin
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"
+
+# set version for s6 overlay
+ARG OVERLAY_VERSION
+ARG OVERLAY_ARCH="aarch64"
+
+# set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/root" \
+LANGUAGE="en_US.UTF-8" \
+LANG="en_US.UTF-8" \
+TERM="xterm"
+
+# copy sources
+COPY sources.list.arm /etc/apt/
+
+RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
+ echo "**** install apt-utils and locales ****" && \
+ apt-get update && \
+ apt-get install -y \
+	apt-utils \
+	locales && \
+ echo "**** install packages ****" && \
+ apt-get install -y \
+	curl \
+	tzdata && \
+ echo "**** generate locale ****" && \
+ locale-gen en_US.UTF-8 && \
+ echo "**** add s6 overlay ****" && \
+ if [ -z ${OVERLAY_VERSION+x} ]; then \
+        OVERLAY_VERSION=$(curl -sX GET "https://api.github.com/repos/just-containers/s6-overlay/releases/latest" \
+        | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+ fi && \
+ curl -o \
+ /tmp/s6-overlay.tar.gz -L \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
+ tar xfz \
+	/tmp/s6-overlay.tar.gz -C / && \
+ echo "**** create abc user and make our folders ****" && \
+ useradd -u 911 -U -d /config -s /bin/false abc && \
+ usermod -G users abc && \
+ mkdir -p \
+	/app \
+	/config \
+	/defaults && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+ENTRYPOINT ["/init"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
new file mode 100644
index 0000000000000000000000000000000000000000..7e3554c49885862dd1b40ca3237a263e923d518d
--- /dev/null
+++ b/Dockerfile.armhf
@@ -0,0 +1,118 @@
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=armhf
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+# Add qemu to build on x86_64 systems
+COPY qemu-arm-static /usr/bin
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"
+
+# set version for s6 overlay
+ARG OVERLAY_VERSION
+ARG OVERLAY_ARCH="arm"
+
+# set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/root" \
+LANGUAGE="en_US.UTF-8" \
+LANG="en_US.UTF-8" \
+TERM="xterm"
+
+# copy sources
+COPY sources.list.arm /etc/apt/
+
+RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
+ echo "**** install apt-utils and locales ****" && \
+ apt-get update && \
+ apt-get install -y \
+	apt-utils \
+	locales && \
+ echo "**** install packages ****" && \
+ apt-get install -y \
+	curl \
+	tzdata && \
+ echo "**** generate locale ****" && \
+ locale-gen en_US.UTF-8 && \
+ echo "**** add s6 overlay ****" && \
+ if [ -z ${OVERLAY_VERSION+x} ]; then \
+        OVERLAY_VERSION=$(curl -sX GET "https://api.github.com/repos/just-containers/s6-overlay/releases/latest" \
+        | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+ fi && \
+ curl -o \
+ /tmp/s6-overlay.tar.gz -L \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
+ tar xfz \
+	/tmp/s6-overlay.tar.gz -C / && \
+ echo "**** create abc user and make our folders ****" && \
+ useradd -u 911 -U -d /config -s /bin/false abc && \
+ usermod -G users abc && \
+ mkdir -p \
+	/app \
+	/config \
+	/defaults && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+ENTRYPOINT ["/init"]
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000000000000000000000000000000000..bc4c08cae0c513bcc0ebd90c8b9a3eab02093d00
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,608 @@
+pipeline {
+  agent {
+    label 'X86-64-MULTI'
+  }
+  // Input to determine if this is a package check
+  parameters {
+     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+  }
+  // Configuration for the variables used for this specific repo
+  environment {
+    BUILDS_DISCORD=credentials('build_webhook_url')
+    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
+    EXT_GIT_BRANCH = 'master'
+    EXT_USER = 'just-containers'
+    EXT_REPO = 's6-overlay'
+    BUILD_VERSION_ARG = 'OVERLAY_VERSION'
+    LS_USER = 'linuxserver'
+    LS_REPO = 'docker-baseimage-ubuntu'
+    CONTAINER_NAME = 'baseimage-ubuntu'
+    DOCKERHUB_IMAGE = 'lsiobase/ubuntu'
+    DEV_DOCKERHUB_IMAGE = 'lsiodev/ubuntu'
+    PR_DOCKERHUB_IMAGE = 'lspipepr/ubuntu'
+    DIST_IMAGE = 'ubuntu'
+    MULTIARCH='true'
+    CI='true'
+    CI_WEB='false'
+    CI_PORT='80'
+    CI_SSL='true'
+    CI_DELAY='30'
+    CI_DOCKERENV='TZ=US/Pacific'
+    CI_AUTH='user:password'
+    CI_WEBPATH=''
+  }
+  stages {
+    // Setup all the basic environment variables needed for the build
+    stage("Set ENV Variables base"){
+      steps{
+        script{
+          env.EXIT_STATUS = ''
+          env.LS_RELEASE = sh(
+            script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
+            returnStdout: true).trim()
+          env.LS_RELEASE_NOTES = sh(
+            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
+            returnStdout: true).trim()
+          env.GITHUB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
+          env.COMMIT_SHA = sh(
+            script: '''git rev-parse HEAD''',
+            returnStdout: true).trim()
+          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
+          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
+          env.PULL_REQUEST = env.CHANGE_ID
+        }
+        script{
+          env.LS_RELEASE_NUMBER = sh(
+            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
+            returnStdout: true).trim()
+        }
+        script{
+          env.LS_TAG_NUMBER = sh(
+            script: '''#! /bin/bash
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
+                         echo ${LS_RELEASE_NUMBER}
+                       elif [ -z "${GIT_COMMIT}" ]; then
+                         echo ${LS_RELEASE_NUMBER}
+                       else
+                         echo $((${LS_RELEASE_NUMBER} + 1))
+                       fi''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    /* #######################
+       Package Version Tagging
+       ####################### */
+    // Grab the current package versions in Git to determine package tag
+    stage("Set Package tag"){
+      steps{
+        script{
+          env.PACKAGE_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e package_versions.txt ] ; then
+                         cat package_versions.txt | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    /* ########################
+       External Release Tagging
+       ######################## */
+    // If this is a stable github release use the latest endpoint from github to determine the ext tag
+    stage("Set ENV github_stable"){
+     steps{
+       script{
+         env.EXT_RELEASE = sh(
+           script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
+           returnStdout: true).trim()
+       }
+     }
+    }
+    // If this is a stable or devel github release generate the link for the build message
+    stage("Set ENV github_link"){
+     steps{
+       script{
+         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
+       }
+     }
+    }
+    // Sanitize the release tag and strip illegal docker or github characters
+    stage("Sanitize tag"){
+      steps{
+        script{
+          env.EXT_RELEASE_CLEAN = sh(
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // If this is a bionic build use live docker endpoints
+    stage("Set ENV live build"){
+      when {
+        branch "bionic"
+        environment name: 'CHANGE_ID', value: ''
+      }
+      steps {
+        script{
+          env.IMAGE = env.DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+        }
+      }
+    }
+    // If this is a dev build use dev docker endpoints
+    stage("Set ENV dev build"){
+      when {
+        not {branch "bionic"}
+        environment name: 'CHANGE_ID', value: ''
+      }
+      steps {
+        script{
+          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
+        }
+      }
+    }
+    // If this is a pull request build use dev docker endpoints
+    stage("Set ENV PR build"){
+      when {
+        not {environment name: 'CHANGE_ID', value: ''}
+      }
+      steps {
+        script{
+          env.IMAGE = env.PR_DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
+          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+        }
+      }
+    }
+    // Run ShellCheck
+    stage('ShellCheck') {
+      when {
+        environment name: 'CI', value: 'true'
+      }
+      steps {
+        withCredentials([
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+        ]) {
+          script{
+            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+          }
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''#! /bin/bash
+                set -e
+                docker pull lsiodev/spaces-file-upload:latest
+                docker run --rm \
+                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
+                -e FILE_NAME="shellcheck-result.xml" \
+                -e MIMETYPE="text/xml" \
+                -v ${WORKSPACE}:/mnt \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -t lsiodev/spaces-file-upload:latest \
+                python /upload.py'''
+        }
+      }
+    }
+    /* ###############
+       Build Container
+       ############### */
+    // Build Docker container for push to LS Repo
+    stage('Build-Single') {
+      when {
+        environment name: 'MULTIARCH', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
+        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+      }
+    }
+    // Build MultiArch Docker containers for push to LS Repo
+    stage('Build-Multi') {
+      when {
+        environment name: 'MULTIARCH', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      parallel {
+        stage('Build X86') {
+          steps {
+            sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+          }
+        }
+        stage('Build ARMHF') {
+          agent {
+            label 'ARMHF'
+          }
+          steps {
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
+              sh "chmod +x qemu-*"
+              sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh '''docker rmi \
+                    ${IMAGE}:arm32v7-${META_TAG} \
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} '''
+            }
+          }
+        }
+        stage('Build ARM64') {
+          agent {
+            label 'ARM64'
+          }
+          steps {
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
+              sh "chmod +x qemu-*"
+              sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh '''docker rmi \
+                    ${IMAGE}:arm64v8-${META_TAG} \
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+            }
+          }
+        }
+      }
+    }
+    // Take the image we just built and dump package versions for comparison
+    stage('Update-packages') {
+      when {
+        branch "bionic"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''#! /bin/bash
+              set -e
+              TEMPDIR=$(mktemp -d)
+              if [ "${MULTIARCH}" == "true" ]; then
+                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
+              else
+                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
+              fi
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apk info -v > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              fi
+              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
+              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
+              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f bionic
+                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
+                cd ${TEMPDIR}/${LS_REPO}/
+                wait
+                git add package_versions.txt
+                git commit -m 'Bot Updating Package Versions'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Package tag updated, stopping build process"
+              else
+                echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Package tag is same as previous continue with build process"
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.PACKAGE_UPDATED = sh(
+            script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // Exit the build if the package file was just updated
+    stage('PACKAGE-exit') {
+      when {
+        branch "bionic"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    // Exit the build if this is just a package check and there are no changes to push
+    stage('PACKAGECHECK-exit') {
+      when {
+        branch "bionic"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+        expression {
+          params.PACKAGE_CHECK == 'true'
+        }
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    /* #######
+       Testing
+       ####### */
+    // Run Container tests
+    stage('Test') {
+      when {
+        environment name: 'CI', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+        ]) {
+          script{
+            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+          }
+          sh '''#! /bin/bash
+                set -e
+                docker pull lsiodev/ci:latest
+                if [ "${MULTIARCH}" == "true" ]; then
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                fi
+                docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock \
+                -e IMAGE=\"${IMAGE}\" \
+                -e DELAY_START=\"${CI_DELAY}\" \
+                -e TAGS=\"${CI_TAGS}\" \
+                -e META_TAG=\"${META_TAG}\" \
+                -e PORT=\"${CI_PORT}\" \
+                -e SSL=\"${CI_SSL}\" \
+                -e BASE=\"${DIST_IMAGE}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
+                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
+                -e WEB_AUTH=\"${CI_AUTH}\" \
+                -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e DO_REGION="ams3" \
+                -e DO_BUCKET="lsio-ci" \
+                -t lsiodev/ci:latest \
+                python /ci/ci.py'''
+        }
+      }
+    }
+    /* ##################
+         Release Logic
+       ################## */
+    // If this is an amd64 only image only push a single image
+    stage('Docker-Push-Single') {
+      when {
+        environment name: 'MULTIARCH', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          echo 'Logging into DockerHub'
+          sh '''#! /bin/bash
+             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+             '''
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:bionic"
+          sh "docker push ${IMAGE}:bionic"
+          sh "docker push ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:${META_TAG} \
+                ${IMAGE}:bionic '''
+                
+        }
+      }
+    }
+    // If this is a multi arch release push all images and define the manifest
+    stage('Docker-Push-Multi') {
+      when {
+        environment name: 'MULTIARCH', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          sh '''#! /bin/bash
+             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+             '''
+          sh '''#! /bin/bash
+                if [ "${CI}" == "false" ]; then
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                fi'''
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-bionic"
+          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-bionic"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-bionic"
+          sh "docker push ${IMAGE}:amd64-${META_TAG}"
+          sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
+          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
+          sh "docker push ${IMAGE}:amd64-bionic"
+          sh "docker push ${IMAGE}:arm32v7-bionic"
+          sh "docker push ${IMAGE}:arm64v8-bionic"
+          sh "docker manifest push --purge ${IMAGE}:bionic || :"
+          sh "docker manifest create ${IMAGE}:bionic ${IMAGE}:amd64-bionic ${IMAGE}:arm32v7-bionic ${IMAGE}:arm64v8-bionic"
+          sh "docker manifest annotate ${IMAGE}:bionic ${IMAGE}:arm32v7-bionic --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:bionic ${IMAGE}:arm64v8-bionic --os linux --arch arm64 --variant v8"
+          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
+          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
+          sh "docker manifest push --purge ${IMAGE}:bionic"
+          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:amd64-${META_TAG} \
+                ${IMAGE}:amd64-bionic \
+                ${IMAGE}:arm32v7-${META_TAG} \
+                ${IMAGE}:arm32v7-bionic \
+                ${IMAGE}:arm64v8-${META_TAG} \
+                ${IMAGE}:arm64v8-bionic \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+        }
+      }
+    }
+    // If this is a public release tag it in the LS Github
+    stage('Github-Tag-Push-Release') {
+      when {
+        branch "bionic"
+        expression {
+          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
+        }
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}"
+        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+             "object": "'${COMMIT_SHA}'",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to bionic",\
+             "type": "commit",\
+             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+        echo "Pushing New release for Tag"
+        sh '''#! /bin/bash
+              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+                     "target_commitish": "bionic",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              paste -d'\\0' start releasebody.json > releasebody.json.done
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
+      }
+    }
+    // Use helper container to sync the current README on master to the dockerhub endpoint
+    stage('Sync-README') {
+      when {
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          sh '''#! /bin/bash
+                docker pull lsiodev/readme-sync
+                docker run --rm=true \
+                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+                  -e DOCKER_REPOSITORY=${IMAGE} \
+                  -e GIT_BRANCH=master \
+                  lsiodev/readme-sync bash -c 'node sync' '''
+        }
+      }
+    }
+    // If this is a Pull request send the CI link as a comment on it
+    stage('Pull Request Comment') {
+      when {
+        not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'CI', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
+        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+      }
+    }
+  }
+  /* ######################
+     Send status to Discord
+     ###################### */
+  post {
+    always {
+      script{
+        if (env.EXIT_STATUS == "ABORTED"){
+          sh 'echo "build aborted"'
+        }
+        else if (currentBuild.currentResult == "SUCCESS"){
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+        }
+        else {
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+        }
+      }
+    }
+  }
+}
diff --git a/README.md b/README.md
index 46d963f43f01d21e72f66dad34d6cc6df3a2ef75..17fb0515bcdebe06b3e94b1ee208fc410cde2261 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,33 @@
 [linuxserverurl]: https://linuxserver.io
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
-[podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://cloud-images.ubuntu.com
+[dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile
 
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
-[Dockerfile](https://github.com/linuxserver/docker-baseimage-xenial/blob/master/Dockerfile)
 
-[![](https://images.microbadger.com/badges/image/lsiobase/xenial.svg)](https://microbadger.com/images/lsiobase/xenial "Get your own image badge on microbadger.com")
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
 
-### This base container is not aimed at public consumption. It exists to serve as a single endpoint for LinuxServer.io containers and is based upon [Ubuntu Xenial](https://hub.docker.com/_/ubuntu/) and [S6 overlay](https://github.com/just-containers/s6-overlay)..
 
-If you want to comment\contribute to this image, are looking for support on any of our other work , or are curious about us in general, check out the following.
+## Contact information:-
 
-* [forum.linuxserver.io][forumurl]
-* [IRC][ircurl] on freenode at `#linuxserver.io`
-* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
+| Type | Address/Details |
+| :---: | --- |
+| Discord | [Discord](https://discord.gg/YWrKVTn) |
+| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
+| Forum | [Linuserver.io forum][forumurl] |
+
+ 
+ 
+
+[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
+
+[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
+
+[![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
+
+A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+
+The following line is only in this repo for loop testing:
+
+- { date: "01.01.50:", desc: "I am the release message for this internal repo." }
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d404706bf35c1da023b0a50ae3f92ec7d2c76e0f
--- /dev/null
+++ b/jenkins-vars.yml
@@ -0,0 +1,29 @@
+---
+
+# jenkins variables
+project_name: docker-baseimage-ubuntu
+external_type: github_stable
+release_type: stable
+release_tag: bionic
+ls_branch: bionic
+repo_vars:
+  - EXT_GIT_BRANCH = 'master'
+  - EXT_USER = 'just-containers'
+  - EXT_REPO = 's6-overlay'
+  - BUILD_VERSION_ARG = 'OVERLAY_VERSION'
+  - LS_USER = 'linuxserver'
+  - LS_REPO = 'docker-baseimage-ubuntu'
+  - CONTAINER_NAME = 'baseimage-ubuntu'
+  - DOCKERHUB_IMAGE = 'lsiobase/ubuntu'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/ubuntu'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/ubuntu'
+  - DIST_IMAGE = 'ubuntu'
+  - MULTIARCH='true'
+  - CI='true'
+  - CI_WEB='false'
+  - CI_PORT='80'
+  - CI_SSL='true'
+  - CI_DELAY='30'
+  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_AUTH='user:password'
+  - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0f0950fcde1af4f61a837871224dc77321202e93
--- /dev/null
+++ b/readme-vars.yml
@@ -0,0 +1,40 @@
+---
+
+# project information
+project_name: base-ubuntu-example
+full_custom_readme: |
+  {% raw -%}
+  [linuxserverurl]: https://linuxserver.io
+  [forumurl]: https://forum.linuxserver.io
+  [ircurl]: https://www.linuxserver.io/irc/
+  [appurl]: https://cloud-images.ubuntu.com
+  [dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile
+
+
+
+  [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
+
+
+  ## Contact information:-
+
+  | Type | Address/Details |
+  | :---: | --- |
+  | Discord | [Discord](https://discord.gg/YWrKVTn) |
+  | IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
+  | Forum | [Linuserver.io forum][forumurl] |
+
+   
+   
+
+  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
+
+  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
+
+  [![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
+
+  A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+
+  The following line is only in this repo for loop testing:
+
+  - { date: "01.01.50:", desc: "I am the release message for this internal repo." }
+  {%- endraw %}
diff --git a/sources.list b/sources.list
index 943b724363e1a8f80f898da5eae93b8f00b583b9..1b2a427317f8d6992862f00eb25a438766e140dd 100644
--- a/sources.list
+++ b/sources.list
@@ -1,32 +1,11 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-
 deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
 deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
-
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
 deb http://archive.ubuntu.com/ubuntu/ bionic universe multiverse
 deb-src http://archive.ubuntu.com/ubuntu/ bionic universe multiverse
 deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe multiverse
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates universe multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-# deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-# deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-
 deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted
 deb http://archive.ubuntu.com/ubuntu/ bionic-security universe multiverse
diff --git a/sources.list.arm b/sources.list.arm
new file mode 100644
index 0000000000000000000000000000000000000000..29c82273422824e180053bfd7a29f4f0faf13fc0
--- /dev/null
+++ b/sources.list.arm
@@ -0,0 +1,12 @@
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security universe