diff --git a/Dockerfile b/Dockerfile
index 9686ab8d..8ac97b77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/calibre-web
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -41,7 +41,7 @@ RUN \
   unzip \
     /tmp/calibre-web.zip -d \
     /app && \
-  mv /app/calibre-web-features/* /app/calibre-web && \
+  cp -r /app/calibre-web-features /app/calibre-web && rm -r /app/calibre-web-features && \
   cd /app/calibre-web && \
   pip3 install --no-cache-dir -U \
     pip wheel && \
diff --git a/install_features_branch.sh b/install_features_branch.sh
new file mode 100644
index 00000000..60e08507
--- /dev/null
+++ b/install_features_branch.sh
@@ -0,0 +1,9 @@
+# Make sure git is installed
+apt-get update -y
+apt-get install git -y
+
+mkdir /app/temp
+cd /app/temp
+git clone -b features https://github.com/JonathanHerrewijnen/calibre-web.git
+cp calibre-web/cps/* ../calibre-web/cps/ -r -f
+rm -r /app/temp
\ No newline at end of file