diff --git a/Dockerfile b/Dockerfile
index db1e1b8..6f6eb79 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
@@ -11,30 +11,30 @@ LABEL maintainer="aptalca"
 ENV HOME="/config"
 
 RUN \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 \
-	libssl1.0 \
-	unzip && \
- echo "**** install embystat ****" && \
- mkdir -p \
-	/opt/embystat && \
- if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
-	EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
-	| jq -r 'first(.[] | .tag_name)'); \
- fi && \
- curl -o \
- /tmp/embystat.zip -L \
-	"https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-ubuntu-x64-v${EMBYSTAT_RELEASE}.zip" && \
-	unzip /tmp/embystat.zip -d \
-	/opt/embystat/ 2> /dev/null || true && \
- chmod +x /opt/embystat/EmbyStat && \
- echo "**** clean up ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 \
+    libssl1.0 \
+    unzip && \
+  echo "**** install embystat ****" && \
+  mkdir -p \
+    /opt/embystat && \
+  if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
+    EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
+      | jq -r 'first(.[] | .tag_name)'); \
+  fi && \
+  curl -o \
+    /tmp/embystat.zip -L \
+    "https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-ubuntu-x64-v${EMBYSTAT_RELEASE}.zip" && \
+  unzip /tmp/embystat.zip -d \
+    /opt/embystat/ 2> /dev/null || true && \
+  chmod +x /opt/embystat/EmbyStat && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY /root /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index fcea955..5714b19 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
@@ -11,30 +11,30 @@ LABEL maintainer="aptalca"
 ENV HOME="/config"
 
 RUN \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 \
-	libssl1.0 \
-	unzip && \
- echo "**** install embystat ****" && \
- mkdir -p \
-	/opt/embystat && \
- if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
-	EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
-	| jq -r 'first(.[] | .tag_name)'); \
- fi && \
- curl -o \
-	/tmp/embystat.zip -L \
-	"https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-linux-arm-x64-v${EMBYSTAT_RELEASE}.zip" && \
-	unzip /tmp/embystat.zip -d \
-	/opt/embystat/ 2> /dev/null || true && \
- chmod +x /opt/embystat/EmbyStat && \
- echo "**** clean up ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 \
+    libssl1.0 \
+    unzip && \
+  echo "**** install embystat ****" && \
+  mkdir -p \
+    /opt/embystat && \
+  if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
+    EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
+      | jq -r 'first(.[] | .tag_name)'); \
+  fi && \
+  curl -o \
+    /tmp/embystat.zip -L \
+    "https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-linux-arm-x64-v${EMBYSTAT_RELEASE}.zip" && \
+  unzip /tmp/embystat.zip -d \
+    /opt/embystat/ 2> /dev/null || true && \
+  chmod +x /opt/embystat/EmbyStat && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY /root /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6a6b31f..5d53ee0 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
@@ -11,30 +11,30 @@ LABEL maintainer="aptalca"
 ENV HOME="/config"
 
 RUN \
- apt-get update && \
- apt-get install -y \
-	jq \
-	libicu60 \
-	libssl1.0 \
-	unzip && \
- echo "**** install embystat ****" && \
- mkdir -p \
-	/opt/embystat && \
- if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
-	EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
-	| jq -r 'first(.[] | .tag_name)'); \
- fi && \
- curl -o \
-	/tmp/embystat.zip -L \
-	"https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-linux-arm-v${EMBYSTAT_RELEASE}.zip" && \
-	unzip /tmp/embystat.zip -d \
-	/opt/embystat/ 2> /dev/null || true && \
- chmod +x /opt/embystat/EmbyStat && \
- echo "**** clean up ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  apt-get update && \
+  apt-get install -y \
+    jq \
+    libicu66 \
+    libssl1.0 \
+    unzip && \
+  echo "**** install embystat ****" && \
+  mkdir -p \
+    /opt/embystat && \
+  if [ -z ${EMBYSTAT_RELEASE+x} ]; then \
+    EMBYSTAT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mregni/EmbyStat/releases" \
+      | jq -r 'first(.[] | .tag_name)'); \
+  fi && \
+  curl -o \
+    /tmp/embystat.zip -L \
+    "https://github.com/mregni/EmbyStat/releases/download/${EMBYSTAT_RELEASE}/EmbyStat-linux-arm-v${EMBYSTAT_RELEASE}.zip" && \
+  unzip /tmp/embystat.zip -d \
+    /opt/embystat/ 2> /dev/null || true && \
+  chmod +x /opt/embystat/EmbyStat && \
+  echo "**** clean up ****" && \
+  rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY /root /
diff --git a/README.md b/README.md
index 0942c4f..1f91fa6 100644
--- a/README.md
+++ b/README.md
@@ -221,6 +221,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.06.22:** - Rebase to focal, update disable updates flag.
 * **08.04.20:** - Structural changes for beta18.
 * **04.12.19:** - Disable in app updates.
 * **12.11.19:** - Multi-arch builds.
diff --git a/readme-vars.yml b/readme-vars.yml
index cbb3dfb..19fa3e3 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -46,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "11.06.22:", desc: "Rebase to focal, update disable updates flag." }
   - { date: "08.04.20:", desc: "Structural changes for beta18." }
   - { date: "04.12.19:", desc: "Disable in app updates." }
   - { date: "12.11.19:", desc: "Multi-arch builds." }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 4cd8b5b..741f418 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -5,5 +5,5 @@ mkdir -p /config/logs
 
 # permissions
 chown -R abc:abc \
-	/opt/embystat \
-	/config
+    /opt/embystat \
+    /config
diff --git a/root/etc/services.d/embystat/run b/root/etc/services.d/embystat/run
index aa4f043..dd19116 100644
--- a/root/etc/services.d/embystat/run
+++ b/root/etc/services.d/embystat/run
@@ -3,5 +3,8 @@
 cd /opt/embystat || exit
 
 exec \
-	s6-setuidgid abc /opt/embystat/EmbyStat --no-updates \
-		--data-dir /config --log-dir /config/logs --config-dir /config
+    s6-setuidgid abc /opt/embystat/EmbyStat \
+        --data-dir /config \
+        --log-dir /config/logs \
+        --config-dir /config \
+        --enable-updates false