diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile
index f92d723..708a0e3 100644
--- a/ot-recorder/Dockerfile
+++ b/ot-recorder/Dockerfile
@@ -2,14 +2,14 @@
 # Dockerfile for ot-recorder
 #
 
-FROM debian:stretch
+FROM debian:buster
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt-get update \
     && apt-get install -y curl gnupg \
     && curl -sSL http://repo.owntracks.org/repo.owntracks.org.gpg.key | apt-key add - \
-    && echo 'deb http://repo.owntracks.org/debian stretch main' > /etc/apt/sources.list.d/owntracks.list \
+    && echo 'deb http://repo.owntracks.org/debian buster main' > /etc/apt/sources.list.d/owntracks.list \
     && apt-get update \
     && apt-get install -y ot-recorder \
     && rm -rf /var/lib/apt/lists/*
diff --git a/ot-recorder/arm/Dockerfile b/ot-recorder/arm/Dockerfile
index 5ed176d..ccf0cd4 100644
--- a/ot-recorder/arm/Dockerfile
+++ b/ot-recorder/arm/Dockerfile
@@ -2,14 +2,14 @@
 # Dockerfile for ot-recorder-arm
 #
 
-FROM arm32v7/debian:jessie
+FROM arm32v7/debian:buster
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt-get update \
     && apt-get install -y curl \
     && curl -sSL http://repo.owntracks.org/repo.owntracks.org.gpg.key | apt-key add - \
-    && echo 'deb http://repo.owntracks.org/debian jessie main' > /etc/apt/sources.list.d/owntracks.list \
+    && echo 'deb http://repo.owntracks.org/debian buster main' > /etc/apt/sources.list.d/owntracks.list \
     && apt-get update \
     && apt-get install -y ot-recorder \
     && rm -rf /var/lib/apt/lists/*