diff --git a/Dockerfile b/Dockerfile
index 17db4fc..b664246 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,24 @@
-FROM debian:jessie
-MAINTAINER Jan Broer <janeczku@yahoo.de>
+FROM debian:buster
+LABEL maintainer="Jan Broer <janeczku@yahoo.de>"
 ENV DEBIAN_FRONTEND noninteractive
 
+# Requirements for trusting their gpg key
+RUN apt-get -qqy update && apt-get -qqy install gnupg2 curl
 # Following 'How do I add or remove Dropbox from my Linux repository?' - https://www.dropbox.com/en/help/246
-RUN echo 'deb http://linux.dropbox.com/debian jessie main' > /etc/apt/sources.list.d/dropbox.list \
-	&& apt-key adv --keyserver pgp.mit.edu --recv-keys 1C61A2656FB57B7E4DE0F4C1FC918B335044912E \
-	&& apt-get -qqy update \
-	# Note 'ca-certificates' dependency is required for 'dropbox start -i' to succeed
-	&& apt-get -qqy install ca-certificates curl python-gpgme dropbox \
-	# Perform image clean up.
-	&& apt-get -qqy autoclean \
-	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-	# Create service account and set permissions.
-	&& groupadd dropbox \
-	&& useradd -m -d /dbox -c "Dropbox Daemon Account" -s /usr/sbin/nologin -g dropbox dropbox
+RUN echo 'deb http://linux.dropbox.com/debian buster main' > /etc/apt/sources.list.d/dropbox.list
+# Dropbox uses the same key for deb and rpm packages, so it's faster to download the key directly
+# from them rather than wait for the poor-old-slow mit keyserver
+RUN curl -L https://linux.dropbox.com/fedora/rpm-public-key.asc | apt-key add -
+RUN apt-get -qqy update
+# Note 'ca-certificates' dependency is required for 'dropbox start -i' to succeed
+RUN apt-get -qqy install ca-certificates dropbox libglapi-mesa libxext-dev \
+	libxdamage-dev libxshmfence-dev libxxf86vm-dev libxcb-glx0 libxcb-dri2-0 libxcb-dri3-0 libxcb-present-dev
+# Perform image clean up.
+RUN apt-get -qqy autoclean
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# Create service account and set permissions.
+RUN groupadd dropbox
+RUN useradd -m -d /dbox -c "Dropbox Daemon Account" -s /usr/sbin/nologin -g dropbox dropbox
 
 # Dropbox is weird: it insists on downloading its binaries itself via 'dropbox
 # start -i'. So we switch to 'dropbox' user temporarily and let it do its thing.
diff --git a/README.md b/README.md
index 1c12954..06dcc0e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,13 @@
+# DEPRECATED - FIND REPLACEMENT BELOW
+
+This repository, much like Docker (both the company and the product) is deprecated.
+
+You will find a much better alternative to this image at: https://github.com/ecnepsnai/podman-dropbox
+
+Original readme below...
+
+---
+
 # Dropbox in Docker
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/janeczku/dropbox.svg?maxAge=2592000)][hub]