diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index e16e8ddb1..a30735c8c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 MAINTAINER Kristian Haugene
 
 VOLUME /data
diff --git a/DockerfileCrossBuild.armhf b/DockerfileCrossBuild.armhf
index ffe22a3b3..9845f8dc0 100644
--- a/DockerfileCrossBuild.armhf
+++ b/DockerfileCrossBuild.armhf
@@ -1,6 +1,6 @@
 # This Dockerfile is for building ARM images on x64 machine like Docker Hub
 
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 MAINTAINER Kristian Haugene
 
 RUN [ "cross-build-start" ]
diff --git a/plugins/rss/Dockerfile.armhf b/plugins/rss/Dockerfile.armhf
index c882f0637..cb6d84a69 100644
--- a/plugins/rss/Dockerfile.armhf
+++ b/plugins/rss/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 MAINTAINER Kristian Haugene
 
 # Update packages and install software
diff --git a/plugins/rss/DockerfileCrossBuild.armhf b/plugins/rss/DockerfileCrossBuild.armhf
index 29186409a..7c36b83d5 100644
--- a/plugins/rss/DockerfileCrossBuild.armhf
+++ b/plugins/rss/DockerfileCrossBuild.armhf
@@ -1,6 +1,6 @@
 # This Dockerfile is for building ARM images on x64 machine like Docker Hub
 
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 MAINTAINER Kristian Haugene
 
 RUN [ "cross-build-start" ]
diff --git a/proxy/Dockerfile.armhf b/proxy/Dockerfile.armhf
index 7d5f073db..5956b0258 100644
--- a/proxy/Dockerfile.armhf
+++ b/proxy/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 
 RUN apt-get update \
       && apt-get install -y \
diff --git a/proxy/DockerfileCrossBuild.armhf b/proxy/DockerfileCrossBuild.armhf
index 0eb85a3d1..ec6ce57b8 100644
--- a/proxy/DockerfileCrossBuild.armhf
+++ b/proxy/DockerfileCrossBuild.armhf
@@ -1,6 +1,6 @@
 # This Dockerfile is for building ARM images on x64 machine like Docker Hub
 
-FROM balenalib/raspberrypi3:stretch
+FROM balenalib/raspberry-pi:stretch
 
 RUN [ "cross-build-start" ]