diff --git a/owntracks/ot-frontend/arm/Dockerfile b/owntracks/ot-frontend/Dockerfile
similarity index 91%
rename from owntracks/ot-frontend/arm/Dockerfile
rename to owntracks/ot-frontend/Dockerfile
index 65ea1b5..b6e5d21 100644
--- a/owntracks/ot-frontend/arm/Dockerfile
+++ b/owntracks/ot-frontend/Dockerfile
@@ -2,14 +2,14 @@
 # Dockerfile for ot-frontend-arm
 #
 
-FROM arm32v7/node:10 AS build
+FROM node:14 AS build
 WORKDIR /usr/src/app
 RUN curl -sSL https://github.com/owntracks/frontend/archive/master.tar.gz | tar xz --strip-components=1
 RUN yarn install
 RUN yarn build
 
 
-FROM arm32v7/nginx:alpine
+FROM nginx:alpine
 MAINTAINER EasyPi Software Foundation
 
 COPY --from=build /usr/src/app/dist /usr/share/nginx/html
diff --git a/owntracks/ot-recorder/arm/Dockerfile b/owntracks/ot-recorder/arm/Dockerfile
deleted file mode 100644
index f941caf..0000000
--- a/owntracks/ot-recorder/arm/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Dockerfile for ot-recorder-arm
-#
-
-FROM arm32v7/debian:stretch
-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 \
-    && apt-get update \
-    && apt-get install -y ot-recorder \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV OTR_HOST       mqtt.eclipse.org
-ENV OTR_PORT       1883
-ENV OTR_HTTPHOST   0.0.0.0
-ENV OTR_HTTPPORT   8083
-ENV OTR_TOPICS     owntracks/#
-ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store
-
-VOLUME $OTR_STORAGEDIR
-
-COPY docker-entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-
-EXPOSE 8083 8085
diff --git a/owntracks/ot-recorder/arm/docker-compose.yml b/owntracks/ot-recorder/arm/docker-compose.yml
deleted file mode 100644
index 74ed7b6..0000000
--- a/owntracks/ot-recorder/arm/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "3.8"
-
-services:
-
-  recorder:
-    image: easypi/ot-recorder-arm
-    ports:
-      - "8083:8083"
-      - "8085:8085"
-    volumes:
-      - ./data:/var/spool/owntracks/recorder/store
-    environment:
-      - OTR_HOST=mqtt.eclipse.org
-      - OTR_PORT=8883
-      - OTR_USER=username
-      - OTR_PASS=password
-      - OTR_TOPICS=owntracks/#
-      - OTR_CAPATH=/etc/ssl/certs/
-      # OTR_OPTIONS=--debug
-    restart: unless-stopped
-
-  frontend:
-    image: easypi/ot-frontend-arm
-    ports:
-      - 8080:80
-    environment:
-      - LISTEN_PORT=80
-      - SERVER_HOST=recorder
-      - SERVER_PORT=8083
-    restart: unless-stopped
diff --git a/owntracks/ot-recorder/arm/docker-entrypoint.sh b/owntracks/ot-recorder/arm/docker-entrypoint.sh
deleted file mode 100755
index e75ff3b..0000000
--- a/owntracks/ot-recorder/arm/docker-entrypoint.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-if ! [ -d $OTR_STORAGEDIR/last ]
-then
-    echo "initializing ..."
-    mkdir -p $OTR_STORAGEDIR/last
-    chown -R owntracks:owntracks $OTR_STORAGEDIR
-    ot-recorder --initialize
-fi
-
-exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}