diff --git a/h2o/Dockerfile b/h2o/Dockerfile
index 39c23ba..94d7d63 100644
--- a/h2o/Dockerfile
+++ b/h2o/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine
 MAINTAINER kev <noreply@easypi.info>
 
-ENV H2O_VER 2.0.1
+ENV H2O_VER 2.0.2
 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz
 ENV H2O_DIR h2o-${H2O_VER}
 
diff --git a/h2o/arm/Dockerfile b/h2o/arm/Dockerfile
index a76cfd4..ca603d0 100644
--- a/h2o/arm/Dockerfile
+++ b/h2o/arm/Dockerfile
@@ -2,10 +2,10 @@
 # Dockerfile for h2o-arm
 #
 
-FROM vimagick/alpine-arm
-MAINTAINER kev <noreply@easypi.info>
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
 
-ENV H2O_VER 2.0.1
+ENV H2O_VER 2.0.2
 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz
 ENV H2O_DIR h2o-${H2O_VER}