diff --git a/conf/Caddyfile b/conf/Caddyfile
index b59b20a..5dab0ae 100644
--- a/conf/Caddyfile
+++ b/conf/Caddyfile
@@ -1,3 +1,3 @@
 :8080 {
-    reverse_proxy cells1:8080
+    reverse_proxy cells:80
 }
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index c511e0f..8fdad78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,24 +1,5 @@
 version: '3.9'
 
-# Common variables
-x-cells: &cells-common
-  image: pydio/cells:4.1
-  restart: unless-stopped
-  environment:
-    - CELLS_WORKING_DIR=/var/cells
-#    - CELLS_CONFIG=etcd://etcd:2379
-#    - CELLS_REGISTRY=etcd://etcd:2379
-    - CELLS_BROKER=nats://nats:4222
-#    - CELLS_KEYRING=vault://vault:8200/secret?key=master
-#    - CELLS_CERTS_STORE=vault://vault:8200/caddycerts
-    - CELLS_CACHE=redis://redis:6379
-#    - CELLS_ENABLE_PPROF=true
-#    - CELLS_BIND_ADDRESS=0.0.0.0
-#    - CELLS_BIND=:443
-#    - CELLS_EXTERNAL=https://${PUBLIC_FQDN}
-    - CELLS_SITE_NO_TLS=1
-#    - VAULT_TOKEN=${VAULT_ROOT_TOKEN}
-
 volumes:
     cells_data: {}
     mysql_data: {}
@@ -48,27 +29,6 @@ services:
     restart: unless-stopped
     expose: [27017]
 
-#  # ETCD Single-Node for registry and configs
-#  etcd:
-#    image: quay.io/coreos/etcd:v3.5.2
-#    entrypoint: /usr/local/bin/etcd
-#    ports:
-#      - 4001:4001
-#      - 2380:2380
-#      - 2379:2379
-#    volumes:
-#      - etcd_data:/etcd_data
-#      - /usr/share/ca-certificates/:/etc/ssl/certs
-#    command:
-#      - '--name=etcd-0'
-#      - '--advertise-client-urls=http://etcd:2379,http://etcd:4001'
-#      - '--listen-client-urls=http://0.0.0.0:2379,http://0.0.0.0:4001'
-#      - '--initial-advertise-peer-urls=http://etcd:2380'
-#      - '--listen-peer-urls=http://0.0.0.0:2380'
-#      - '--initial-cluster-token=etcd-cluster-1'
-#      - '--initial-cluster=etcd-0=http://etcd:2380'
-#      - '--initial-cluster-state=new'
-
   # Nats events broker
   nats:
     image: nats:2.9.15
@@ -78,15 +38,6 @@ services:
     #for verbose, use "--http_port 8222 -V"
     command: "--http_port 8222"
 
-#  # Hashicorp vault for keyring and certificates
-#  vault:
-#    image: vault
-#    expose: [8200]
-#    environment:
-#      - VAULT_DEV_ROOT_TOKEN_ID=${VAULT_ROOT_TOKEN}
-#    cap_add:
-#      - IPC_LOCK
-
   redis:
     image: redis:7.0.9
     hostname: redis
@@ -121,25 +72,19 @@ services:
       /usr/bin/mc mb myminio/binaries;
       exit 0;
       "
-  #
-  # CELLS MULTIPLE NODES
-  # cells1 overrides env and volumes to access the install YAML
-  #
-  cells1:
-    <<: *cells-common
-    hostname: cells1
-    expose: [8080]
+
+  cells:
+    image: pydio/cells:4.1
+    restart: unless-stopped
+    hostname: cells
+    expose: [80]
     environment:
       - CELLS_WORKING_DIR=/var/cells
-#      - CELLS_CONFIG=etcd://etcd:2379
-#      - CELLS_REGISTRY=etcd://etcd:2379
       - CELLS_BROKER=nats://nats:4222
-#      - CELLS_KEYRING=vault://vault:8200/secret?key=master
-#      - CELLS_CERTS_STORE=vault://vault:8200/caddycerts
       - CELLS_CACHE=redis://redis:6379
-#      - CELLS_ENABLE_PPROF=true
-      - CELLS_BIND_ADDRESS=0.0.0.0
-#      - VAULT_TOKEN=${VAULT_ROOT_TOKEN}
+      - CELLS_BIND=0.0.0.0:80
+      - CELLS_EXTERNAL=http://localhost
+      - CELLS_NO_TLS=1
       - CELLS_INSTALL_YAML=/pydio/config/install.yml
       - INSTALL_MYSQL_DB_USER=${MYSQL_DB_USER}
       - INSTALL_MYSQL_DB_PASSWORD=${MYSQL_DB_PASSWORD}
@@ -147,25 +92,6 @@ services:
       - INSTALL_MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
     volumes:
       - ./conf/install-conf.yml:/pydio/config/install.yml:ro
-#    ports:
-#      - "8080:8080" # We expose that port externally for first configuration step (access to https://localhost:8080)
-#      - "8002:8002" # uncomment if you want to browse the internal registry of this node using cells-ctl
-
-#  cells2:
-#    <<: *cells-common
-#    hostname: cells2
-#    expose: [8080]
-## uncomment if you want to open this instance directly on localhost:8082
-##    ports:
-##      - 8082:8080
-
-#  cells3:
-#    <<: *cells-common
-#    hostname: cells3
-#    expose: [8080]
-## uncomment if you want to open this instance directly on localhost:8083
-##    ports:
-##      - 8083:8080
 
   # Caddy reverse proxy, exposed as self-signed on port 445
   caddy: