diff --git a/.gitmodules b/.gitmodules
index 7889b1ae..145ea1ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "thunor"]
-	path = thunor
+	path = thunorcore
 	url = https://github.com/alubbock/thunor.git
diff --git a/Dockerfile b/Dockerfile
index 79dfca62..fab33111 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.12-slim-bullseye AS thunorweb_base
 LABEL org.opencontainers.image.authors="code@alexlubbock.com"
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 ENV THUNOR_HOME=/thunor
 
 RUN apt update && apt install -y libpq-dev gcc libmagic1 libpcre3-dev media-types \
@@ -10,13 +10,12 @@ RUN mkdir $THUNOR_HOME
 WORKDIR $THUNOR_HOME
 
 ADD requirements.txt $THUNOR_HOME
-ADD thunor $THUNOR_HOME/thunor
+ADD thunorcore $THUNOR_HOME/thunorcore
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN dpkg --purge gcc libpcre3-dev
 CMD ["uwsgi", "--master", "--socket", ":8000", "--module", "thunordjango.wsgi", "--uid", "www-data", "--gid", "www-data", "--enable-threads"]
 ADD manage.py $THUNOR_HOME
 ADD thunordjango $THUNOR_HOME/thunordjango
-RUN cd $THUNOR_HOME/thunor && python3 setup.py install
 ADD thunorweb $THUNOR_HOME/thunorweb
 ARG THUNORWEB_VERSION=unknown
 RUN printf "def get_versions():\n    return {'version': '$THUNORWEB_VERSION'}\n" > $THUNOR_HOME/thunorweb/_version.py
diff --git a/requirements.txt b/requirements.txt
index 2772c16d..0371aea4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
--e ./thunor[test]
+-e ./thunorcore[test]
 numpy==2.1.1
 pandas==2.2.2
 plotly==5.24.0
diff --git a/thunor b/thunor
deleted file mode 160000
index 9333543c..00000000
--- a/thunor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9333543cace83d5defc47d47abc980a2203eec77
diff --git a/thunorcore b/thunorcore
new file mode 160000
index 00000000..98c536de
--- /dev/null
+++ b/thunorcore
@@ -0,0 +1 @@
+Subproject commit 98c536ded0732f2f2435c664139e48346de08b54