diff --git a/Dockerfile b/Dockerfile
index d3f9a2c1432cb2212f174be84df2410fe0b25f75..cfeea727b381a250be3d4facc0abbf3a9c76783e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,18 @@ 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
+
+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
+RUN rm -rf ${CODESONAR_HOME}/csurf/lib/codesonarj-runtimes/androidAPI23/android-6.0.1_r1.jar
 
 
 RUN mkdir /home/codesonar/hub \