diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 63693b275..21c7aba40 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -29,7 +29,7 @@ RUN set -ex; \
     ; \
     echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
     locale-gen; \
-    mkdir -p /opt/data; \
+    mkdir -p /opt/data/assets; \
     mkdir -p /opt/penpot; \
     chown -R penpot:penpot /opt/penpot; \
     chown -R penpot:penpot /opt/data; \
diff --git a/docker/images/Dockerfile.frontend b/docker/images/Dockerfile.frontend
index f2708974e..84b2493dc 100644
--- a/docker/images/Dockerfile.frontend
+++ b/docker/images/Dockerfile.frontend
@@ -1,6 +1,11 @@
 FROM nginx:1.23
 LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
+RUN set -ex; \
+    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
+    mkdir -p /opt/data/assets; \
+    chown -R penpot:penpot /opt/data;
+
 ADD ./bundle-frontend/ /var/www/app/
 ADD ./files/config.js /var/www/app/js/config.js
 ADD ./files/nginx.conf /etc/nginx/nginx.conf
diff --git a/docker/images/docker-compose.yaml b/docker/images/docker-compose.yaml
index 975b08dd7..8b0f671c9 100644
--- a/docker/images/docker-compose.yaml
+++ b/docker/images/docker-compose.yaml
@@ -36,6 +36,7 @@ services:
 
   penpot-frontend:
     image: "penpotapp/frontend:latest"
+    restart: always
     ports:
       - 9001:80
 
@@ -96,8 +97,10 @@ services:
 
   penpot-backend:
     image: "penpotapp/backend:latest"
+    restart: always
+
     volumes:
-      - penpot_assets:/opt/penpot/assets
+      - penpot_assets:/opt/data/assets
 
     depends_on:
       - penpot-postgres
@@ -214,6 +217,7 @@ services:
 
   penpot-exporter:
     image: "penpotapp/exporter:latest"
+    restart: always
     networks:
       - penpot
 
@@ -268,6 +272,7 @@ services:
   # minio:
   #   image: "minio/minio:latest"
   #   command: minio server /mnt/data --console-address ":9001"
+  #   restart: always
   #
   #   volumes:
   #     - "penpot_minio:/mnt/data"