diff --git a/api b/api
index 94b7be2ef..02626954d 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 94b7be2ef71f2a1ccb13738013838f09f8921bd7
+Subproject commit 02626954d6218d6fa1125cc7827d4242bad54b75
diff --git a/docker-compose.yml b/docker-compose.yml
index 271089361..82bdfb788 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,10 +15,11 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-lago}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-changeme}
       PGDATA: /data/postgres
+      PGPORT: ${POSTGRES_PORT:-5432}
     volumes:
       - lago_postgres_data:/data/postgres
     ports:
-      - ${POSTGRES_PORT:-5432}:5432
+      - ${POSTGRES_PORT:-5432}:${POSTGRES_PORT:-5432}
 
   redis:
     image: redis:6.2-alpine
@@ -32,7 +33,7 @@ services:
 
   api:
     container_name: lago-api
-    image: getlago/api:v0.39.0-beta
+    image: getlago/api:v0.39.1-beta
     restart: unless-stopped
     depends_on:
       - db
@@ -116,7 +117,7 @@ services:
 
   api-worker:
     container_name: lago-worker
-    image: getlago/api:v0.39.0-beta
+    image: getlago/api:v0.39.1-beta
     restart: unless-stopped
     depends_on:
       - api
@@ -154,7 +155,7 @@ services:
 
   api-clock:
     container_name: lago-clock
-    image: getlago/api:v0.39.0-beta
+    image: getlago/api:v0.39.1-beta
     restart: unless-stopped
     depends_on:
       - api
diff --git a/front b/front
index d3664a9ff..e6eeaa6f0 160000
--- a/front
+++ b/front
@@ -1 +1 @@
-Subproject commit d3664a9ffd0c26fcdd74206384a13e07cfb1bcfa
+Subproject commit e6eeaa6f01da2c42eafd660bd765e8f001627f7e