diff --git a/Dockerfile b/Dockerfile
index 2fb72e2a..6caa3c23 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,43 @@
-FROM debian:buster
+FROM circleci/python:3.7.5
 
-RUN set -ex \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-       curl \
-       dumb-init \
-       gcc \
-       gnupg \
-       python3-pip \
-       gstreamer1.0-alsa \
-       gstreamer1.0-plugins-bad \
-       python3-gst-1.0 \
-       git \
-       nano \
-       sudo \
- && python3 -m pip install --pre mopidy \
- && git clone https://github.com/jaedb/Iris.git /iris \
- && cd /iris \
- && mkdir -p /var/lib/mopidy/.config \
- && ln -s /config /var/lib/mopidy/.config/mopidy
+# Switch to the root user while we do our changes
+USER root
+
+# Install GStreamer and other required Debian packages
+RUN apt-get update \
+  && apt-get install -y \
+    curl \
+    dumb-init \
+    graphviz-dev \
+    gstreamer1.0-plugins-bad \
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-ugly \
+    libasound2-dev \
+    python-dev \
+    python-gst-1.0 \
+    python3-gst-1.0 \
+    git \
+    nano \
+    sudo \
+  && git clone https://github.com/jaedb/Iris.git /iris \
+  && cd /iris \
+  && mkdir -p /var/lib/mopidy/.config \
+  && ln -s /config /var/lib/mopidy/.config/mopidy \
+  && rm -rf /var/lib/apt/lists/*
+
+# Make python3-gst-1.0 available to non-Debian Python 3.7 installation
+RUN ln -s /usr/lib/python3/dist-packages/gi /usr/local/lib/python3.7/site-packages/gi
+
+# Install libspotify-dev from apt.mopidy.com
+RUN wget -q -O - https://apt.mopidy.com/mopidy.gpg \
+  | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add - \
+  && wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/buster.list \
+  && apt-get update \
+  && apt-get install -y libspotify-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install additional Python dependencies
+RUN python3.7 -m pip install --no-cache tox
 
 # Start helper script.
 COPY docker/entrypoint.sh /entrypoint.sh
@@ -29,11 +48,15 @@ COPY docker/mopidy.example.conf /config/mopidy.conf
 # Copy the pulse-client configuratrion.
 COPY docker/pulse-client.conf /etc/pulse/client.conf
 
+# Add a VERSION file to the image
+ADD VERSION /
+
 # Allows any user to run mopidy, but runs by default as a randomly generated UID/GID.
 ENV HOME=/var/lib/mopidy
 
 EXPOSE 6600 6680
 
-CMD ["/bin/bash"]
-#ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
-#CMD ["mopidy"]
+# Switch back to the circleci user
+USER circleci
+
+CMD ["/bin/sh"]
\ No newline at end of file
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..7e5885c1
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.7.5-2
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 00000000..4deaeda8
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,41 @@
+FROM circleci/python:3.7.5
+
+
+# Switch to the root user while we do our changes
+USER root
+
+# Install GStreamer and other required Debian packages
+RUN apt-get update \
+  && apt-get install -y \
+    graphviz-dev \
+    gstreamer1.0-plugins-bad \
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-ugly \
+    libasound2-dev \
+    python-dev \
+    python-gst-1.0 \
+    python3-gst-1.0 \
+  && rm -rf /var/lib/apt/lists/*
+
+# Make python3-gst-1.0 available to non-Debian Python 3.7 installation
+RUN ln -s /usr/lib/python3/dist-packages/gi /usr/local/lib/python3.7/site-packages/gi
+
+# Install libspotify-dev from apt.mopidy.com
+RUN wget -q -O - https://apt.mopidy.com/mopidy.gpg \
+  | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add - \
+  && wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/buster.list \
+  && apt-get update \
+  && apt-get install -y libspotify-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install additional Python dependencies
+RUN python3.7 -m pip install --no-cache tox
+
+# Add a VERSION file to the image
+ADD VERSION /
+
+
+# Switch back to the circleci user
+USER circleci
+
+CMD ["/bin/sh"]