diff --git a/api b/api
index ee4ca6e8..e92601dd 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit ee4ca6e86a2f6f238e66f7e73bac84917d75c909
+Subproject commit e92601dd20a71c8b96d629b24d94d83033f46441
diff --git a/docker-compose.yml b/docker-compose.yml
index d235e2f3..8b0078a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,12 +32,12 @@ services:
 
   api:
     container_name: lago-api
-    image: getlago/api:v1.17.5
+    image: getlago/api:v1.18.0
     restart: unless-stopped
     depends_on:
       - db
       - redis
-    command: ['./scripts/start.sh']
+    command: ["./scripts/start.sh"]
     healthcheck:
       test: curl -f http://localhost:3000/health || exit 1
       interval: 10s
@@ -95,7 +95,7 @@ services:
 
   front:
     container_name: lago-front
-    image: getlago/front:v1.17.5
+    image: getlago/front:v1.18.0
     restart: unless-stopped
     # Use this command if you want to use SSL with Let's Encrypt
     # command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
@@ -134,14 +134,14 @@ services:
 
   api-worker:
     container_name: lago-worker
-    image: getlago/api:v1.17.5
+    image: getlago/api:v1.18.0
     restart: unless-stopped
     depends_on:
       api:
         condition: service_healthy
-    command: ['./scripts/start.worker.sh']
+    command: ["./scripts/start.worker.sh"]
     healthcheck:
-      test: ['CMD-SHELL', 'bundle exec sidekiqmon | grep $(hostname) || exit 1']
+      test: ["CMD-SHELL", "bundle exec sidekiqmon | grep $(hostname) || exit 1"]
     environment:
       - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000}
       - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}?search_path=${POSTGRES_SCHEMA:-public}
@@ -185,7 +185,7 @@ services:
   # It is recommendend if you have a high usage of events to not impact the other Sidekiq Jobs.
   #api-events-worker:
   #  container_name: lago-events-worker
-  #  image: getlago/api:v1.17.5
+  #  image: getlago/api:v1.18.0
   #  restart: unless-stopped
   #  depends_on:
   #    api:
@@ -230,7 +230,7 @@ services:
   # It is recommended if you have a high usage of invoices being created to not impact the other Sidekiq Jobs.
   #api-pdfs-worker:
   #  container_name: lago-pdfs-worker
-  #  image: getlago/api:v1.17.5
+  #  image: getlago/api:v1.18.0
   #  restart: unless-stopped
   #  depends_on:
   #    api:
@@ -275,7 +275,7 @@ services:
   # It is recommended if you have a high usage of invoices being created to not impact the other Sidekiq Jobs.
   #api-billing-worker:
   #  container_name: lago-billing-worker
-  #  image: getlago/api:v1.17.5
+  #  image: getlago/api:v1.18.0
   #  restart: unless-stopped
   #  depends_on:
   #    api:
@@ -320,7 +320,7 @@ services:
   # You can uncomment this if you want to use a dedicated Sidekiq worker for the clock jobs.
   #api-clock-worker:
   #  container_name: lago-clock-worker
-  #  image: getlago/api:v1.17.5
+  #  image: getlago/api:v1.18.0
   #  restart: unless-stopped
   #  depends_on:
   #    api:
@@ -365,7 +365,7 @@ services:
   # You can uncomment this if you want to use a dedicated Sidekiq worker for the webhook jobs.
   #api-webhook-worker:
   #  container_name: lago-webhook-worker
-  #  image: getlago/api:v1.17.5
+  #  image: getlago/api:v1.18.0
   #  restart: unless-stopped
   #  depends_on:
   #    api:
@@ -409,12 +409,12 @@ services:
 
   api-clock:
     container_name: lago-clock
-    image: getlago/api:v1.17.5
+    image: getlago/api:v1.18.0
     restart: unless-stopped
     depends_on:
       api:
         condition: service_healthy
-    command: ['./scripts/start.clock.sh']
+    command: ["./scripts/start.clock.sh"]
     environment:
       - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000}
       - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}?search_path=${POSTGRES_SCHEMA:-public}
@@ -440,11 +440,11 @@ services:
 
   migrate:
     container_name: lago-migrate
-    image: getlago/api:v1.17.5
+    image: getlago/api:v1.18.0
     depends_on:
       - db
       - redis
-    command: ['./scripts/start.migrate.sh']
+    command: ["./scripts/start.migrate.sh"]
     volumes:
       - lago_storage_data:/app/storage
     environment:
diff --git a/front b/front
index ee28b551..8f8835f1 160000
--- a/front
+++ b/front
@@ -1 +1 @@
-Subproject commit ee28b551825f16d81e0095d6f8b8a63ec3d2213f
+Subproject commit 8f8835f163aa91df39b2ca74039ad0a380c5627a