diff --git a/Dockerfile b/Dockerfile
index 154867b..b76aca4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.8
+FROM lsiobase/nginx:3.9
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 60b31a4..795a05c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,7 +1,4 @@
-FROM lsiobase/alpine.nginx.arm64:3.8
-
-# Add qemu to build on x86_64 systems
-COPY qemu-aarch64-static /usr/bin
+FROM lsiobase/nginx:arm64v8-3.9
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d037a48..0e10b06 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,7 +1,4 @@
-FROM lsiobase/alpine.nginx.armhf:3.8
-
-# Add qemu to build on x86_64 systems
-COPY qemu-arm-static /usr/bin
+FROM lsiobase/nginx:arm32v7-3.9
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 8e3dcb3..3a3977f 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The architectures supported by this image are:
 | :----: | --- |
 | x86-64 | amd64-latest |
 | arm64 | arm64v8-latest |
-| armhf | arm32v6-latest |
+| armhf | arm32v7-latest |
 
 
 ## Usage
@@ -180,6 +180,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.05.19:** - Rebase to alpine 3.9, use new armv7 image format.
 * **21.01.18:** - Added ffmpeg for video thumbnail creation, switched to installing zip release instead of source tarball, created small thumbnails folder, switched to dynamic readme.
 * **14.01.19:** - Adding pipeline logic and multi arch..
 * **04.09.18:** - Rebase to alpine 3.8, switch to LycheeOrg repository.
diff --git a/readme-vars.yml b/readme-vars.yml
index 81e3897..b7cb52a 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -11,7 +11,7 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -38,10 +38,11 @@ app_setup_block: |
   More info at [lychee]({{ project_url }}).  
 # changelog
 changelogs:
+  - { date: "05.05.19:", desc: "Rebase to alpine 3.9, use new armv7 image format." }
   - { date: "21.01.18:", desc: "Added ffmpeg for video thumbnail creation, switched to installing zip release instead of source tarball, created small thumbnails folder, switched to dynamic readme." }
   - { date: "14.01.19:", desc: "Adding pipeline logic and multi arch.." }
   - { date: "04.09.18:", desc: "Rebase to alpine 3.8, switch to LycheeOrg repository." }
   - { date: "08.01.18:", desc: "Rebase to alpine 3.7." }
   - { date: "25.05.17:", desc: "Rebase to alpine 3.6." }
   - { date: "03.05.17:", desc: "Use repo pinning to better solve dependencies, use repo version of php7-imagick." }
-  - { date: "12.02.17:", desc: "Initial Release." }
\ No newline at end of file
+  - { date: "12.02.17:", desc: "Initial Release." }