diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile
index e6dccfc..f92d723 100644
--- a/ot-recorder/Dockerfile
+++ b/ot-recorder/Dockerfile
@@ -2,14 +2,14 @@
 # Dockerfile for ot-recorder
 #
 
-FROM debian:jessie
+FROM debian:stretch
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt-get update \
-    && apt-get install -y curl \
+    && 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 jessie main' > /etc/apt/sources.list.d/owntracks.list \
+    && echo 'deb http://repo.owntracks.org/debian stretch 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 e99cb2e..c219f04 100644
--- a/ot-recorder/arm/Dockerfile
+++ b/ot-recorder/arm/Dockerfile
@@ -7,9 +7,9 @@ MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt-get update \
-    && apt-get install -y curl \
+    && 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 jessie main' > /etc/apt/sources.list.d/owntracks.list \
+    && echo 'deb http://repo.owntracks.org/debian stretch main' > /etc/apt/sources.list.d/owntracks.list \
     && apt-get update \
     && apt-get install -y ot-recorder \
     && rm -rf /var/lib/apt/lists/*