diff --git a/Dockerfile b/Dockerfile
index ff1f721..6bdca9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:18.04
+FROM ghcr.io/siwatinc/siwat-ubuntubaseimage:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=America/New_York
+ENV TZ=Asia/Bangkok
 
 RUN apt-get update && apt-get install -y \
     cmake \
@@ -52,9 +52,8 @@ https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/m
 https://github.com/marian42/octoprint-preheat/archive/master.zip \
 https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip \
 https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip \
-https://github.com/jneilliii/OctoPrint-UltimakerFormatPackage/archive/master.zip \
 https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/archive/master.zip \
-https://github.com/LazeMSS/OctoPrint-UICustomizer/archive/main.zip
+https://github.com/TheSpaghettiDetective/OctoPrint-TheSpaghettiDetective/archive/master.zip
 
 VOLUME /home/octoprint/.octoprint