diff --git a/CHANGELOG b/CHANGELOG
index 211f26a1..d0894be4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 === v0.1.65 ===
+- Add UI Dark Mode
+- Improve LND Connect IP detection (again)
+- Refactor for electrum server improvements
+- Install docker and docker-compose dependency
 
 === v0.1.64 ===
 - Improve logging for upgrades
diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
index ccade19c..c7e66e53 100755
--- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh
+++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
@@ -12,7 +12,7 @@ systemctl stop bitcoind
 
 # Install any new software
 apt -y install pv sysstat network-manager unzip pkg-config libfreetype6-dev libpng-dev
-apt -y install libatlas-base-dev
+apt -y install libatlas-base-dev libffi-dev libssl-dev
 
 # Install any pip software
 pip install tzupdate
@@ -21,6 +21,7 @@ pip install tzupdate
 # Install any pip3 software
 pip3 install python-bitcointx
 pip3 install lndmanage==0.8.0   # Install LND Manage (keep up to date with LND)
+pip3 install docker-compose
 
 
 # Import Keys
@@ -28,6 +29,16 @@ curl https://keybase.io/roasbeef/pgp_keys.asc | gpg --import
 gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 01EA5486DE18A882D4C2684590C8019E36C2E964
 
 
+# Install docker
+if [ ! -f /usr/bin/docker ]; then
+    curl -sSL https://get.docker.com | sh
+fi
+groupadd docker || true
+usermod -aG docker admin
+usermod -aG docker bitcoin
+usermod -aG docker root
+
+
 # Upgrade BTC
 BTC_VERSION="0.18.1"
 ARCH="arm-linux-gnueabihf"
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index f9f7b7e8..da526e0c 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -73,6 +73,7 @@ apt-get -y install inotify-tools libssl-dev tor tmux screen
 apt-get -y install python-grpcio python3-grpcio
 apt-get -y install pv sysstat network-manager rsync parted unzip pkg-config
 apt-get -y install libfreetype6-dev libpng-dev libatlas-base-dev
+apt-get -y install libffi-dev libssl-dev
 
 
 # Install other things without recommendation
@@ -121,6 +122,7 @@ pip3 install wheel setuptools
 pip3 install bitstring lnd-grpc pycoin aiohttp connectrum python-bitcoinlib
 pip3 install python-bitcointx
 pip3 install lndmanage==0.8.0   # Install LND Manage (keep up to date with LND)
+pip3 install docker-compose
 
 
 # Install Rust
@@ -137,6 +139,15 @@ if [ ! -f /tmp/installed_node ]; then
     touch /tmp/installed_node
 fi
 
+# Install docker
+if [ ! -f /usr/bin/docker ]; then
+    curl -sSL https://get.docker.com | sh
+fi
+groupadd docker || true
+usermod -aG docker admin
+usermod -aG docker bitcoin
+usermod -aG docker root
+
 # Install node packages
 npm install -g pug-cli browserify uglify-js babel-cli