diff --git a/Dockerfile b/Dockerfile
index 54da08f..c991765 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
@@ -13,35 +13,35 @@ ENV XDG_DATA_HOME="/config" \
 XDG_CONFIG_HOME="/config"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 && \
- echo "**** install jackett ****" && \
- mkdir -p \
-	/app/Jackett && \
- if [ -z ${JACKETT_RELEASE+x} ]; then \
-	JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
-	| jq -r .tag_name); \
- fi && \
- curl -o \
- /tmp/jacket.tar.gz -L \
-	"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxAMDx64.tar.gz" && \
- tar xf \
- /tmp/jacket.tar.gz -C \
-	/app/Jackett --strip-components=1 && \
- echo "**** fix for host id mapping error ****" && \
- chown -R root:root /app/Jackett && \
- echo "**** save docker image version ****" && \
- echo "${VERSION}" > /etc/docker-image && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/* \
-	/var/log/*
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 && \
+  echo "**** install jackett ****" && \
+  mkdir -p \
+    /app/Jackett && \
+  if [ -z ${JACKETT_RELEASE+x} ]; then \
+    JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
+    | jq -r .tag_name); \
+  fi && \
+  curl -o \
+    /tmp/jacket.tar.gz -L \
+    "https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxAMDx64.tar.gz" && \
+  tar xf \
+    /tmp/jacket.tar.gz -C \
+    /app/Jackett --strip-components=1 && \
+  echo "**** fix for host id mapping error ****" && \
+  chown -R root:root /app/Jackett && \
+  echo "**** save docker image version ****" && \
+  echo "${VERSION}" > /etc/docker-image && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7f8ae3c..629ffd5 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -13,35 +13,35 @@ ENV XDG_DATA_HOME="/config" \
 XDG_CONFIG_HOME="/config"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 && \
- echo "**** install jackett ****" && \
- mkdir -p \
-	/app/Jackett && \
- if [ -z ${JACKETT_RELEASE+x} ]; then \
-	JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
-	| jq -r .tag_name); \
- fi && \
- curl -o \
- /tmp/jacket.tar.gz -L \
-	"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM64.tar.gz" && \
- tar xf \
- /tmp/jacket.tar.gz -C \
-	/app/Jackett --strip-components=1 && \
- echo "**** fix for host id mapping error ****" && \
- chown -R root:root /app/Jackett && \
- echo "**** save docker image version ****" && \
- echo "${VERSION}" > /etc/docker-image && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/* \
-	/var/log/*
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 && \
+  echo "**** install jackett ****" && \
+  mkdir -p \
+    /app/Jackett && \
+  if [ -z ${JACKETT_RELEASE+x} ]; then \
+    JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
+    | jq -r .tag_name); \
+  fi && \
+  curl -o \
+    /tmp/jacket.tar.gz -L \
+    "https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM64.tar.gz" && \
+  tar xf \
+    /tmp/jacket.tar.gz -C \
+    /app/Jackett --strip-components=1 && \
+  echo "**** fix for host id mapping error ****" && \
+  chown -R root:root /app/Jackett && \
+  echo "**** save docker image version ****" && \
+  echo "${VERSION}" > /etc/docker-image && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b6da644..be1b123 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -13,35 +13,35 @@ ENV XDG_DATA_HOME="/config" \
 XDG_CONFIG_HOME="/config"
 
 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 && \
- echo "**** install jackett ****" && \
- mkdir -p \
-	/app/Jackett && \
- if [ -z ${JACKETT_RELEASE+x} ]; then \
-	JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
-	| jq -r .tag_name); \
- fi && \
- curl -o \
- /tmp/jacket.tar.gz -L \
-	"https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM32.tar.gz" && \
- tar xf \
- /tmp/jacket.tar.gz -C \
-	/app/Jackett --strip-components=1 && \
- echo "**** fix for host id mapping error ****" && \
- chown -R root:root /app/Jackett && \
- echo "**** save docker image version ****" && \
- echo "${VERSION}" > /etc/docker-image && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/* \
-	/var/log/*
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 && \
+  echo "**** install jackett ****" && \
+  mkdir -p \
+    /app/Jackett && \
+  if [ -z ${JACKETT_RELEASE+x} ]; then \
+    JACKETT_RELEASE=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
+    | jq -r .tag_name); \
+  fi && \
+  curl -o \
+    /tmp/jacket.tar.gz -L \
+    "https://github.com/Jackett/Jackett/releases/download/${JACKETT_RELEASE}/Jackett.Binaries.LinuxARM32.tar.gz" && \
+  tar xf \
+    /tmp/jacket.tar.gz -C \
+    /app/Jackett --strip-components=1 && \
+  echo "**** fix for host id mapping error ****" && \
+  chown -R root:root /app/Jackett && \
+  echo "**** save docker image version ****" && \
+  echo "${VERSION}" > /etc/docker-image && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /
diff --git a/README.md b/README.md
index 7940f21..bfe667a 100644
--- a/README.md
+++ b/README.md
@@ -242,6 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.05.22:** - Rebase to Ubuntu Focal.
 * **24.05.20:** - Allow user to optionally enable auto updates.
 * **31.12.19:** - Remove agressive startup chowning.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
diff --git a/readme-vars.yml b/readme-vars.yml
index a1dd234..194f272 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -58,6 +58,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "10.05.22:", desc: "Rebase to Ubuntu Focal." }
   - { date: "24.05.20:", desc: "Allow user to optionally enable auto updates." }
   - { date: "31.12.19:", desc: "Remove agressive startup chowning." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 03c2971..206c009 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -1,9 +1,9 @@
 #!/usr/bin/with-contenv bash
 
 chown -R abc:abc \
-	/config
+    /config
 
 if [ -z ${AUTO_UPDATE+x} ] || [ "${AUTO_UPDATE}" == "true" ]; then
-	chown -R abc:abc \
-		/app/Jackett
+    chown -R abc:abc \
+        /app/Jackett
 fi
diff --git a/root/etc/services.d/jackett/run b/root/etc/services.d/jackett/run
index 040e7ab..a88f793 100644
--- a/root/etc/services.d/jackett/run
+++ b/root/etc/services.d/jackett/run
@@ -1,10 +1,10 @@
 #!/usr/bin/with-contenv bash
 
 if [ -z ${AUTO_UPDATE+x} ] || [ "${AUTO_UPDATE}" == "true" ]; then
-	COMMAND="/app/Jackett/jackett_launcher.sh"
+    COMMAND="/app/Jackett/jackett_launcher.sh"
 else
-	COMMAND="/app/Jackett/jackett --NoUpdates"
+    COMMAND="/app/Jackett/jackett --NoUpdates"
 fi
 
 exec \
-	s6-setuidgid abc ${COMMAND} ${RUN_OPTS}
+    s6-setuidgid abc ${COMMAND} ${RUN_OPTS}