diff --git a/Dockerfile b/Dockerfile
index 7f22866..ff5b390 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN \
 	/tmp/opt/emby-server/etc
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 840f1bf..760cfa6 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as buildstage
 
 # build args
 ARG EMBY_RELEASE
@@ -32,7 +32,7 @@ RUN \
 	/tmp/opt/emby-server/etc
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -44,11 +44,14 @@ LABEL maintainer="thelamer"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
- echo "**** add emby deps ****" && \
+ echo "**** add emby deps *****" && \
+ curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
+ echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	libomxil-bellagio0 \
-	libomxil-bellagio-bin && \
+	libomxil-bellagio-bin \
+	libraspberrypi0 && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 54ab6ec..bed51a8 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -32,7 +32,7 @@ RUN \
 	/tmp/opt/emby-server/etc
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -44,13 +44,9 @@ LABEL maintainer="thelamer"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y --no-install-recommends \
-	gnupg && \
  echo "**** add emby deps *****" && \
  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
- echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
+ echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	libomxil-bellagio0 \
diff --git a/README.md b/README.md
index 3389ce0..8cec461 100644
--- a/README.md
+++ b/README.md
@@ -291,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.12.20:** - Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf.
 * **03.07.20:** - Add support for amd vaapi hw transcode.
 * **28.02.20:** - Add v4l2 support on Raspberry Pi.
 * **26.02.20:** - Add openmax support on Raspberry Pi.
diff --git a/readme-vars.yml b/readme-vars.yml
index 2434da6..a0057a9 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -91,6 +91,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "21.12.20:", desc: "Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." }
   - { date: "03.07.20:", desc: "Add support for amd vaapi hw transcode." }
   - { date: "28.02.20:", desc: "Add v4l2 support on Raspberry Pi." }
   - { date: "26.02.20:", desc: "Add openmax support on Raspberry Pi." }