diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile
index b648b01..c412822 100644
--- a/ot-recorder/Dockerfile
+++ b/ot-recorder/Dockerfile
@@ -18,7 +18,7 @@ ENV OTR_HOST       iot.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
-ENV OTR_TOPICS     owntracks/#
+ENV OTR_TOPICS     owntracks/+/+
 ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store
 
 VOLUME $OTR_STORAGEDIR
diff --git a/ot-recorder/arm/Dockerfile b/ot-recorder/arm/Dockerfile
index 69a3b6c..6ddb9d3 100644
--- a/ot-recorder/arm/Dockerfile
+++ b/ot-recorder/arm/Dockerfile
@@ -18,7 +18,7 @@ ENV OTR_HOST       iot.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
-ENV OTR_TOPICS     owntracks/#
+ENV OTR_TOPICS     owntracks/+/+
 ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store
 
 VOLUME $OTR_STORAGEDIR
diff --git a/ot-recorder/arm/docker-entrypoint.sh b/ot-recorder/arm/docker-entrypoint.sh
index e75ff3b..04111fc 100755
--- a/ot-recorder/arm/docker-entrypoint.sh
+++ b/ot-recorder/arm/docker-entrypoint.sh
@@ -10,4 +10,4 @@ then
     ot-recorder --initialize
 fi
 
-exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}
+exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/+/+}
diff --git a/ot-recorder/docker-entrypoint.sh b/ot-recorder/docker-entrypoint.sh
index e75ff3b..04111fc 100755
--- a/ot-recorder/docker-entrypoint.sh
+++ b/ot-recorder/docker-entrypoint.sh
@@ -10,4 +10,4 @@ then
     ot-recorder --initialize
 fi
 
-exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}
+exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/+/+}