diff --git a/Dockerfile b/Dockerfile
index ba3f39b..904afc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM lsiobase/ffmpeg:bin as binstage
-FROM lsiobase/ubuntu:bionic
+FROM ghcr.io/linuxserver/ffmpeg:bin as binstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -10,34 +10,36 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # hardware env
 ENV \
- LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
- NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" \
- NVIDIA_VISIBLE_DEVICES="all"
+  LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
+  NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" \
+  NVIDIA_VISIBLE_DEVICES="all"
 
 RUN \
- echo "**** install runtime ****" && \
- apt-get update && \
- apt-get install -y \
-	i965-va-driver \
-	libexpat1 \
-	libgl1-mesa-dri \
-	libglib2.0-0 \
-	libgomp1 \
-	libharfbuzz0b \
-	libv4l-0 \
-	libx11-6 \
-	libxcb1 \
-	libxcb-shape0 \
-	libxcb-xfixes0 \
-	libxext6 \
-	libxml2 \
-	ocl-icd-libopencl1 && \
- echo "**** clean up ****" && \
- rm -rf \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install runtime ****" && \
+    apt-get update && \
+    apt-get install -y \
+    i965-va-driver \
+    libexpat1 \
+    libgl1-mesa-dri \
+    libglib2.0-0 \
+    libgomp1 \
+    libharfbuzz0b \
+    libv4l-0 \
+    libx11-6 \
+    libxcb1 \
+    libxcb-shape0 \
+    libxcb-xfixes0 \
+    libxext6 \
+    libxml2 \
+    ocl-icd-libopencl1 && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 COPY /root /
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8e8020c..307e7e7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,5 @@
-FROM lsiobase/ffmpeg:arm64v8-bin as binstage
-FROM lsiobase/ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/ffmpeg:arm64v8-bin as binstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -10,24 +10,26 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 RUN \
- echo "**** install runtime ****" && \
- apt-get update && \
- apt-get install -y \
-	libexpat1 \
-	libfontconfig1 \
-	libglib2.0-0 \
-	libgomp1 \
-	libharfbuzz0b \
-	libv4l-0 \
-	libx11-6 \
-	libxcb1 \
-	libxext6 \
-	libxml2 && \
- echo "**** clean up ****" && \
- rm -rf \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install runtime ****" && \
+  apt-get update && \
+  apt-get install -y \
+    libexpat1 \
+    libfontconfig1 \
+    libglib2.0-0 \
+    libgomp1 \
+    libharfbuzz0b \
+    libv4l-0 \
+    libx11-6 \
+    libxcb1 \
+    libxext6 \
+    libxml2 && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 COPY /root /
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 2ef8d2d..55e633d 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,5 +1,5 @@
-FROM lsiobase/ffmpeg:arm32v7-bin as binstage
-FROM lsiobase/ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/ffmpeg:arm32v7-bin as binstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -10,24 +10,26 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 RUN \
- echo "**** install runtime ****" && \
- apt-get update && \
- apt-get install -y \
-	libexpat1 \
-	libfontconfig1 \
-	libglib2.0-0 \
-	libgomp1 \
-	libharfbuzz0b \
-	libv4l-0 \
-	libx11-6 \
-	libxcb1 \
-	libxext6 \
-	libxml2 && \
- echo "**** clean up ****" && \
- rm -rf \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "**** install runtime ****" && \
+  apt-get update && \
+  apt-get install -y \
+    libexpat1 \
+    libfontconfig1 \
+    libglib2.0-0 \
+    libgomp1 \
+    libharfbuzz0b \
+    libv4l-0 \
+    libx11-6 \
+    libxcb1 \
+    libxext6 \
+    libxml2 && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 COPY /root /
 
diff --git a/README.md b/README.md
index 0411d4e..35685a0 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.06.22:** - Rebase to Focal.
 * **26.08.21:** - Add support for libOpenCL.
 * **01.07.21:** - Bump to 4.4.
 * **17.06.20:** - Bump to 4.3.
diff --git a/readme-vars.yml b/readme-vars.yml
index 3bc3a18..bef8b9f 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -130,6 +130,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **19.06.22:** - Rebase to Focal.
   * **26.08.21:** - Add support for libOpenCL.
   * **01.07.21:** - Bump to 4.4.
   * **17.06.20:** - Bump to 4.3.