diff --git a/Dockerfile b/Dockerfile
index 10d83bf..ba509e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,39 +1,33 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 LABEL maintainer="Pedro Lobo <https://github.com/pslobo>"
 LABEL Name="Dockerized xmr-node-proxy"
 LABEL Version="1.4"
-
+RUN apt-get update
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
 RUN export BUILD_DEPS="cmake \
                        pkg-config \
                        git \
                        build-essential \
                        curl" \
-
     && apt-get update && apt-get upgrade -qqy  \
     && apt-get install --no-install-recommends -qqy \
-        ${BUILD_DEPS} python-virtualenv \
+        ${BUILD_DEPS} python3-virtualenv \
         python3-virtualenv ntp screen \
         libboost-all-dev libevent-dev \
         libunbound-dev libminiupnpc-dev \
         libunwind8-dev liblzma-dev libldns-dev \
         libexpat1-dev libgtest-dev libzmq3-dev \
-
-    && curl -o- https://deb.nodesource.com/setup_6.x| bash \
+    && curl -o- https://deb.nodesource.com/setup_12.x| bash \
     && apt-get install nodejs \
-
-    && git clone https://github.com/Snipa22/xmr-node-proxy /app \
+    && git clone https://github.com/cryptoandcoffee/xmr-node-proxy /app \
     && cd /app && npm install \
-
     && openssl req -subj "/C=IT/ST=Pool/L=Daemon/O=Mining Pool/CN=mining.proxy" \
         -newkey rsa:2048 -nodes -keyout cert.key -x509 -out cert.pem -days 36500 \
-
     && apt-get --auto-remove purge -qqy ${BUILD_DEPS} \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && chown -R proxy.proxy /app \
     && mkdir /logs && chown -R proxy.proxy /logs
-
 USER proxy
 WORKDIR /app
-
-ENTRYPOINT ["node","proxy.js"]
\ No newline at end of file
+ENTRYPOINT ["node","proxy.js"]
diff --git a/README.md b/README.md
index a390fe1..977764a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 ## Setup Instructions
 
-Based on a clean Ubuntu 16.04 LTS minimal install
+Based on a clean Ubuntu 20.04 LTS minimal install
 
 ## Deployment via Installer
 
@@ -51,7 +51,7 @@ pm2 monit
 
 VMs with 512Mb or less RAM will need some swap space in order to compile the C extensions for node.  Bignum and the CN libraries can chew through some serious memory during compile.  In regards to this, one of our users has put together a guide for T2.Micro servers: https://docs.google.com/document/d/1m8E4_pDwKuFo0TnWJaO13LDHqOmbL6YrzyR6FvzqGgU (Credit goes to MayDay30 for his work with this!)
 
-If not running on an Ubuntu 16.04 system, please make sure your kernel is at least 3.2 or higher, as older versions will not work for this.
+If not running on an Ubuntu 20.04 system, please make sure your kernel is at least 3.2 or higher, as older versions will not work for this.
 
 Many smaller VMs come with ulimits set very low. We suggest looking into setting the ulimit higher. In particular, `nofile` (Number of files open) needs to be raised for high-usage instances.
 
@@ -82,7 +82,7 @@ The proxy is pre-configured for a 1% donation. This is easily toggled inside of
 
 ## Installation/Configuration Assistance
 
-If you need help installing the pool from scratch, please have your servers ready, which would be Ubuntu 16.04 servers, blank and clean, DNS records pointed.  These need to be x86_64 boxes with AES-NI Available.
+If you need help installing the pool from scratch, please have your servers ready, which would be Ubuntu 20.04 servers, blank and clean, DNS records pointed.  These need to be x86_64 boxes with AES-NI Available.
 
 Installation asstiance is 4 XMR, with a 2 XMR deposit, with remainder to be paid on completion.  
 Configuration assistance is 2 XMR with a 1 XMR deposit, and includes debugging your proxy configurations, ensuring that everything is running, and tuning for your uses/needs.  
@@ -96,16 +96,8 @@ Please contact Snipa at: proxy_installs@snipanet.com or via IRC on irc.freenode.
 * [XMRPool.net](https://xmrpool.net)
 * [supportXMR.com](https://supportxmr.com)
 * [pool.xmr.pt](https://pool.xmr.pt)
-* [minemonero.pro](https://minemonero.pro)
-* [XMRPool.xyz](https://xmrpool.xyz)
-* [ViaXMR.com](https://viaxmr.com)
-* [mine.MoneroPRO.com](https://mine.moneropro.com)
 * [MinerCircle.com](https://www.minercircle.com)
-* [xmr.p00ls.net](https://www.p00ls.net)
-* [MoriaXMR.com](https://moriaxmr.com)
 * [MoneroOcean.stream](https://moneroocean.stream)
-* [SECUmine.net](https://secumine.net)
-* [Chinaenter.cn](http://xmr.chinaenter.cn)
 * [XMRPool.eu](https://xmrpool.eu)
 
 If you'd like to have your pool added, please make a pull request here, or contact Snipa on IRC!
diff --git a/package.json b/package.json
index 936aa1f..d020ddc 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/snipa22/xmr-node-proxy#readme",
   "dependencies": {
     "async": "2.1.4",
-    "bignum": "^0.12.5",
+    "bignum": "^0.13.1",
     "body-parser": "^1.16.0",
     "circular-buffer": "1.0.2",
     "cluster": "0.7.7",