diff --git a/Dockerfile b/Dockerfile
index 04900fa..59e36b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM lsiobase/cloud9:files as builder
-FROM lsiobase/ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-cloud9:files as builder
+FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 065a115..5221626 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,5 @@
-FROM lsiobase/cloud9:arm64v8-files as builder
-FROM lsiobase/ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-cloud9:arm64v8-files as builder
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d83fa58..bfca1f0 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,5 +1,5 @@
-FROM lsiobase/cloud9:arm32v7-files as builder
-FROM lsiobase/ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-cloud9:arm32v7-files as builder
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
 
 # set version label
 ARG BUILD_DATE