diff --git a/Dockerfile b/Dockerfile
index 616698701010e3fa56f2844975a272ad0536d852..33d039ca8a0157196451dcaad4e95f1186492348 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,14 +30,21 @@ RUN rm -rf /opt/${CODESONAR_PACKAGE}
 RUN ln -s ${CODESONAR_HOME} /opt/codesonar
 RUN useradd -ms /bin/bash codesonar
 
-# Remove older software versions no longer needed
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-8.3
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-8.4
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.0
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.1
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.2
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.3
-RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.6
+#This is a hubless installation, so we can remove hub components:
+RUN cd /opt/codesonar; rm -rf codesonar/doc \
+codesonar/py/hub \
+codesonar/py/processors \
+codesonar/src/api/javadoc \
+codevice \
+csurf/doc \
+csurf/src/api/javadoc \
+csurf/src/feir/api/javadoc \
+third-party/boost \
+third-party/jquery \
+third-party/postgresql* \
+third-party/sqlalchemy \
+)
+
 
 RUN rm -rf ${CODESONAR_HOME}/csonar-eclipse/com.grammatech.codesonar.jar
 RUN rm -rf ${CODESONAR_HOME}/csonar-eclipse/eclipse_tests/CodeSonarTest_1.0.0.jar
@@ -55,8 +62,6 @@ RUN rm /opt/codesonar-6.1p0/third-party/python/instmt/lib/python3.9/site-package
 RUN rm /opt/codesonar-6.1p0/third-party/python/instmt/lib/python3.9/site-packages/slapdtest/certs/server.key
 
 
-RUN mkdir /home/codesonar/hub \
-    && chown codesonar.codesonar /home/codesonar/hub
 
 #The following is needed as RH8 does not have libnsl.so.1
 RUN ln -s /usr/lib64/libnsl.so.2 /usr/lib64/libnsl.so.1