diff --git a/tools/docker/cells/dockerfile b/tools/docker/cells/dockerfile
index 5b4d09c7d5..3ab9b20ea7 100755
--- a/tools/docker/cells/dockerfile
+++ b/tools/docker/cells/dockerfile
@@ -1,6 +1,7 @@
 FROM busybox:glibc
 
-ENV CELLS_VERSION 1.0.0
+ARG version
+ENV CELLS_VERSION ${version}
 
 WORKDIR /cells
 
diff --git a/tools/docker/docker-compose.yaml b/tools/docker/docker-compose.yaml
index b01c2e32ea..ddb9c33fc4 100644
--- a/tools/docker/docker-compose.yaml
+++ b/tools/docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
 
     # Cells image with two named volumes for the static and for the data
     cells:
-        image: cells:latest
+        image: pydio/cells:latest
         restart: always
         volumes: ["static:/root/.config/pydio/cells/static/pydio", "data:/root/.config/pydio/cells/data"]
         ports: ["8080:8080"]
@@ -25,7 +25,7 @@ services:
 
     # PHP FPM image with the static named volume from the cells container
     php:
-        image: cells-php:latest
+        image: pydio/cells-php-fpm:latest
         restart: always
         volumes: ["static:/root/.config/pydio/cells/static/pydio"]