diff --git a/.env.sample b/.env.sample
index ebd6581..7978b18 100644
--- a/.env.sample
+++ b/.env.sample
@@ -26,3 +26,7 @@ NEXTCLOUD_ADMIN_PASSWORD=h4ckMePleAse873214668
 
 # Portainer
 PORTAINER_ADMIN_PASSWORD=h4ckMePleAse
+
+# Flood username declared in  deluge rpc daemon
+FLOOD_PASSWORD=myfloodpassword
+FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON=false
\ No newline at end of file
diff --git a/README.md b/README.md
index 9bb7efb..6f4d6a7 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ seedbox and personal media server.
 -----------------------|----------------------------|------------------------------------------------------------------------|-------------------------|---------------------|
 | Plex                 | plex.yourdomain.com        | [linuxserver/plex](https://hub.docker.com/r/linuxserver/plex)          | *latest*                | Media Streaming     |
 | Deluge               | deluge.yourdomain.com      | [linuxserver/deluge](https://hub.docker.com/r/linuxserver/deluge)      | *latest*                | Torrents downloader |
+| Flood               | flood.yourdomain.com      | [jesec/flood](https://hub.docker.com/r/jesec/flood)      | *latest*      | Web client for Deluge (experimental) |
 | Sonarr               | sonarr.yourdomain.com      | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr)      | *develop*               | TV Shows monitor    |
 | Radarr               | radarr.yourdomain.com      | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr)      | *develop*                | Movies monitor      |
 | Bazarr               | bazarr.yourdomain.com      | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr)      | *latest*                | Subtitles monitor   |
diff --git a/services.conf b/services.conf
index 4bf8d54..3d4078d 100644
--- a/services.conf
+++ b/services.conf
@@ -1,4 +1,5 @@
 deluge: enable
+flood: enable
 plex: enable
 flaresolverr: enable
 jackett: enable
diff --git a/services/deluge.yaml b/services/deluge.yaml
index 96474d3..d304ae3 100644
--- a/services/deluge.yaml
+++ b/services/deluge.yaml
@@ -16,38 +16,8 @@ services:
       - "traefik.http.routers.deluge.rule=Host(`deluge.${TRAEFIK_DOMAIN}`)"
       - "traefik.http.routers.deluge.middlewares=common-auth@file"
 
-  flood:
-    image: jesec/flood:latest
-    container_name: flood
-    restart: always
-    depends_on:
-      - deluge
-    user: ${PUID}:${PGID}
-    command:
-      - --auth=none
-      - --dehost=deluge
-      - --deport=58846
-      - --deuser=deluge
-      - --depass=deluge
-      - --rundir=/config
-    volumes:
-      - configflood:/config
-      - torrents:/torrents
-      - downloads:/downloads
-      - /etc/localtime:/etc/localtime:ro
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.flood.rule=Host(`flood.${TRAEFIK_DOMAIN}`)"
-      - "traefik.http.routers.flood.middlewares=common-auth@file"
-      - "traefik.http.routers.flood.service=flood-service"
-      - "traefik.http.services.flood-service.loadbalancer.server.port=3000"
-
 volumes:
   configdeluge: 
     driver: local-persist
     driver_opts:
-      mountpoint: /data/config/deluge
-  configflood: 
-    driver: local-persist
-    driver_opts:
-      mountpoint: /data/config/flood
\ No newline at end of file
+      mountpoint: /data/config/deluge
\ No newline at end of file
diff --git a/services/flood.yaml b/services/flood.yaml
new file mode 100644
index 0000000..8a89089
--- /dev/null
+++ b/services/flood.yaml
@@ -0,0 +1,32 @@
+services:
+  flood:
+    image: jesec/flood:latest
+    container_name: flood
+    restart: always
+    depends_on:
+      - deluge
+    user: ${PUID}:${PGID}
+    command:
+      - --auth=none
+      - --dehost=deluge
+      - --deport=58846
+      - --deuser=flood
+      - --depass=${FLOOD_PASSWORD}
+      - --rundir=/config
+    volumes:
+      - configflood:/config
+      - torrents:/torrents
+      - downloads:/downloads
+      - /etc/localtime:/etc/localtime:ro
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.flood.rule=Host(`flood.${TRAEFIK_DOMAIN}`)"
+      - "traefik.http.routers.flood.middlewares=common-auth@file"
+      - "traefik.http.routers.flood.service=flood-service"
+      - "traefik.http.services.flood-service.loadbalancer.server.port=3000"
+
+volumes:
+  configflood: 
+    driver: local-persist
+    driver_opts:
+      mountpoint: /data/config/flood
\ No newline at end of file
diff --git a/update-all.sh b/update-all.sh
index 406d5ea..5c14843 100755
--- a/update-all.sh
+++ b/update-all.sh
@@ -30,6 +30,12 @@ done < <(grep "disable" services.conf | awk -F : '{print  $1}' )
 SERVICES=$(find services -mindepth 1 -maxdepth 1 -name "*.yaml" ${disabled_pattern} | sed -e 's/^/-f /')
 ALL_SERVICES="-f docker-compose.yaml $SERVICES"
 
+# Specific instructions for Flood
+# User for Deluge daemon RPC has to be created in deluge auth config file
+if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} ]]; then
+  echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth
+fi
+
 if [[ "${SKIP_PULL}" != "1" ]]; then
   echo "[$0] ***** Pulling all images... *****"
   docker-compose ${ALL_SERVICES} pull