diff --git a/Dockerfile b/Dockerfile
index ae32036..0b1c06e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,4 +39,4 @@ WORKDIR /publish
 COPY --chown=1000:1000 --from=build-env /publish .
 USER 0
 ENTRYPOINT ["dotnet", "/publish/API.dll"]
-CMD ["-f", "-c", "-l", "/usr/share/tranga-api/logs"]
\ No newline at end of file
+CMD [""]
\ No newline at end of file
diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml
index e08e84e..6626884 100644
--- a/docker-compose.local.yaml
+++ b/docker-compose.local.yaml
@@ -16,6 +16,11 @@ services:
     environment:
       - POSTGRES_HOST=tranga-pg
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-pg:
     image: postgres:latest
     container_name: tranga-pg
@@ -30,3 +35,8 @@ services:
       retries: 5
       start_period: 80s
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index bd44543..8ee9588 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   tranga-api:
-    image: glax/tranga-api:latest
+    image: glax/tranga-api:Server-V2
     container_name: tranga-api
     volumes:
       - ./Manga:/Manga
@@ -14,14 +14,24 @@ services:
     environment:
       - POSTGRES_HOST=tranga-pg
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-website:
-    image: glax/tranga-website:latest
+    image: glax/tranga-website:Server-V2
     container_name: tranga-website
     ports:
       - "9555:80"
     depends_on: 
       - tranga-api
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-pg:
     image: postgres:latest
     container_name: tranga-pg
@@ -36,3 +46,8 @@ services:
       retries: 5
       start_period: 80s
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"