diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 795062f..8601f52 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,4 +1,5 @@
-FROM balenalib/aarch64-debian:stretch
+FROM arm64v8/debian:buster
+# FROM balenalib/aarch64-debian:stretch
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 943d38b..d4b960b 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,4 +1,5 @@
-FROM balenalib/armv7hf-debian:stretch
+FROM arm32v7/debian:buster
+# FROM balenalib/armv7hf-debian:stretch
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"