diff --git a/deploy/docker/cloudbeaver-ce/Dockerfile b/deploy/docker/cloudbeaver-ce/Dockerfile
index 361df92c0a..95bdcc6812 100644
--- a/deploy/docker/cloudbeaver-ce/Dockerfile
+++ b/deploy/docker/cloudbeaver-ce/Dockerfile
@@ -2,6 +2,9 @@ FROM dbeaver/base-java
 
 MAINTAINER DBeaver Corp, devops@dbeaver.com
 
+RUN apt-get update; \
+    apt-get upgrade -y; 
+    
 COPY cloudbeaver /opt/cloudbeaver
 
 EXPOSE 8978
diff --git a/webapp/packages/core-browser/src/service-worker.ts b/webapp/packages/core-browser/src/service-worker.ts
index 4849f1b029..2d104d07df 100644
--- a/webapp/packages/core-browser/src/service-worker.ts
+++ b/webapp/packages/core-browser/src/service-worker.ts
@@ -117,7 +117,7 @@ registerRoute(
 );
 
 registerRoute(
-  ({ request }) => request.destination === 'image',
+  ({ request, url }) => url.origin === self.location.origin && request.destination === 'image',
   new CacheFirst({
     cacheName: 'images',
     plugins: [
@@ -127,6 +127,7 @@ registerRoute(
       new ExpirationPlugin({
         maxEntries: 1000,
         maxAgeSeconds: 7 * 24 * 60 * 60,
+        purgeOnQuotaError: true,
       }),
     ],
   }),