diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 547c57c8..533d7a6c 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -24,6 +24,7 @@ RUN apt-get update && \
     libcurl4-openssl-dev \
     inetutils-ping \
   && rm -rf /var/lib/apt/lists/* \
+  && c_rehash \
   && cd /tmp \
   && curl -sL https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz -o git.tgz \
   && tar zxf git.tgz \
@@ -35,7 +36,7 @@ RUN apt-get update && \
   && rm -rf /tmp/git.tgz /tmp/git-${GIT_VERSION}
 
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-  && add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+  && [[ $(lsb_release -cs) == "eoan" ]] && ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu disco stable" ) || ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" )\
   && apt-get update \
   && apt-get install -y docker-ce --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile.ubuntu-bionic b/Dockerfile.ubuntu-bionic
index 7b19b3ca..5728cacd 100644
--- a/Dockerfile.ubuntu-bionic
+++ b/Dockerfile.ubuntu-bionic
@@ -18,7 +18,7 @@ RUN apt-get update && \
   && rm -rf /var/lib/apt/lists/*
 
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-  && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+  && add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
   && apt-get update \
   && apt-get install -y docker-ce --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile.ubuntu-xenial b/Dockerfile.ubuntu-xenial
index d8a9b42c..41c89511 100644
--- a/Dockerfile.ubuntu-xenial
+++ b/Dockerfile.ubuntu-xenial
@@ -18,7 +18,7 @@ RUN apt-get update && \
   && rm -rf /var/lib/apt/lists/*
 
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-  && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+  && add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
   && apt-get update \
   && apt-get install -y docker-ce --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
diff --git a/README.md b/README.md
index 6fb95616..58f1286f 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,13 @@ This has been tested and verified on:
 
  * x86_64
  * armhf
+ * armv7
+ * arm64
 
 ## Examples ##
 
 Manual:
 
-### X86_64 ###
-
 ```
 docker run -it \
   -e REPO_URL="https://github.com/myoung34/LEDSpicer" \
@@ -21,14 +21,7 @@ docker run -it \
   myoung34/github-runner:latest
 ```
 
-### ARMHF (raspberry pi) ###
-
-```
-docker run -it \
-  -e REPO_URL="https://github.com/myoung34/LEDSpicer" \
-  -e RUNNER_TOKEN="footoken" \
-  myoung34/github-runner:latest-arm
-```
+Or as an alias:
 
 ```
 function run-server {