diff --git a/owncloud.yml b/owncloud.yml
index 47237c6..be169ea 100644
--- a/owncloud.yml
+++ b/owncloud.yml
@@ -1,79 +1,97 @@
 version: '3.3'
 
 volumes:
   files:
     driver: local
   mysql:
     driver: local
   backup:
     driver: local
   redis:
     driver: local
   apache:
     driver: local
   office:
     driver: local
   office_opt:
     driver: local
 
 services:
 
    owncloud:
+     networks:
+      - proxy
+      - mariadb_network
+
      image: owncloud/server:latest
      depends_on:
        - db
        - redis
      environment:
        - OWNCLOUD_DOMAIN=localhost
        - OWNCLOUD_DB_TYPE=mysql
        - OWNCLOUD_DB_NAME=owncloud
        - OWNCLOUD_DB_USERNAME=owncloud
        - OWNCLOUD_DB_PASSWORD=owncloud
        - OWNCLOUD_DB_HOST=db
        - OWNCLOUD_ADMIN_USERNAME=admin
        - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
        - OWNCLOUD_UTF8MB4_ENABLED=true
        - OWNCLOUD_REDIS_ENABLED=true
        - OWNCLOUD_REDIS_HOST=redis
      healthcheck:
        test: ["CMD", "curl", "-f", "http://localhost/status.php"]
        interval: 30s
        timeout: 10s
        retries: 5
      volumes:
        - files:/mnt/data
        - apache:/etc/apache2
 
    db:
+     networks:
+      - mariadb_network
+
      image: webhippie/mariadb:latest
 
      environment:
        - MARIADB_ROOT_PASSWORD==${MARIADB_PASSWORD}
        - MARIADB_USERNAME=owncloud
        - MARIADB_PASSWORD=owncloud
        - MARIADB_DATABASE=owncloud
        - MARIADB_MAX_ALLOWED_PACKET=1024M
        - MARIADB_INNODB_LOG_FILE_SIZE=500M
        - MARIADB_INNODB_LARGE_PREFIX=ON
        - MARIADB_INNODB_FILE_FORMAT=Barracuda
+       - VIRTUAL_HOST=lsms-cloud.epfl.ch
+       - VIRTUAL_PORT=80
+       - VIRTUAL_PATH=/
+       - VIRTUAL_DEST=/
+
      healthcheck:
        test: ["CMD", "/usr/bin/healthcheck"]
        interval: 30s
        timeout: 10s
        retries: 5
      volumes:
        - mysql:/var/lib/mysql
        - backup:/var/lib/backup
 
    redis:
      image: webhippie/redis:latest
      restart: always
      environment:
        - REDIS_DATABASES=1
      healthcheck:
        test: ["CMD", "/usr/bin/healthcheck"]
        interval: 30s
        timeout: 10s
        retries: 5
      volumes:
        - redis:/var/lib/redis
+
+networks:
+  proxy:
+    external: true
+  mariadb_network:
+    external: true
diff --git a/portainer.yml b/portainer.yml
index 1e14e2f..54799e2 100644
--- a/portainer.yml
+++ b/portainer.yml
@@ -1,66 +1,64 @@
 version: '3.2'
 
 services:
   nginx-proxy:
     image: jwilder/nginx-proxy
     networks:
       - proxy
     ports:
       - "80:80"
       - "443:443"
     volumes:
       - "/var/run/docker.sock:/tmp/docker.sock:ro"
       - "./vhost.d:/etc/nginx/vhost.d:ro"
       - /etc/pki/tls/certs/:/etc/nginx/certs
     environment:
       - HTTPS_METHOD=nohttp
 
   agent:
     image: portainer/agent:2.9.3
     environment:
       # REQUIRED: Should be equal to the service name prefixed by "tasks." when
       # deployed inside an overlay network
       AGENT_CLUSTER_ADDR: tasks.agent
       # AGENT_PORT: 9001
       # LOG_LEVEL: debug
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/volumes:/var/lib/docker/volumes
     networks:
       - agent_network
     deploy:
       mode: global
       placement:
         constraints: [node.platform.os == linux]
 
   portainer:
     image: portainer/portainer-ce:2.9.3
     command: -H tcp://tasks.agent:9001 --tlsskipverify
     volumes:
       - data:/data
     environment:
       - VIRTUAL_HOST=lsms-cloud.epfl.ch
       - VIRTUAL_PORT=9000
       - VIRTUAL_PATH=/portainer/
       - VIRTUAL_DEST=/
       
-    # ports:
-    #   - 8000:8000
     networks:
       - proxy
       - agent_network
     deploy:
       mode: replicated
       replicas: 1
       placement:
         constraints: [node.role == manager]
 
 
 networks:
   proxy:
     external: true
   agent_network:
     external: true
 
 volumes:
    data: