diff --git a/Dockerfile b/Dockerfile
index f3fa041d..1a18a7f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG SERVER_VERSION=v0.19.0
+ARG SERVER_VERSION=07617750
 
 # Builder image to compile the website
 FROM ubuntu AS builder
@@ -27,7 +27,8 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server
-FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
+#FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
+FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION}
 ARG SERVER_VERSION
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
diff --git a/configuration/ehcache.xml b/configuration/ehcache.xml
index c0752420..0318d507 100644
--- a/configuration/ehcache.xml
+++ b/configuration/ehcache.xml
@@ -80,4 +80,40 @@
             <disk unit="MB">8</disk>
         </resources>
     </cache>
+    <cache alias="files.webresource">
+        <expiry>
+            <tti unit="minutes">5</tti>
+        </expiry>
+        <listeners>
+            <listener>
+                <class>org.eclipse.openvsx.cache.ExpiredFileListener</class>
+                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
+                <event-ordering-mode>UNORDERED</event-ordering-mode>
+                <events-to-fire-on>EXPIRED</events-to-fire-on>
+                <events-to-fire-on>EVICTED</events-to-fire-on>
+                <events-to-fire-on>REMOVED</events-to-fire-on>
+            </listener>
+        </listeners>
+        <resources>
+            <heap>150</heap>
+        </resources>
+    </cache>
+    <cache alias="files.extension">
+        <expiry>
+            <tti unit="minutes">5</tti>
+        </expiry>
+        <listeners>
+            <listener>
+                <class>org.eclipse.openvsx.cache.ExpiredFileListener</class>
+                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
+                <event-ordering-mode>UNORDERED</event-ordering-mode>
+                <events-to-fire-on>EXPIRED</events-to-fire-on>
+                <events-to-fire-on>EVICTED</events-to-fire-on>
+                <events-to-fire-on>REMOVED</events-to-fire-on>
+            </listener>
+        </listeners>
+        <resources>
+            <heap>20</heap>
+        </resources>
+    </cache>
 </config>
\ No newline at end of file