diff --git a/README (conflicted copy 2022-05-12 102943).md b/README (conflicted copy 2022-05-12 102943).md
new file mode 100644
index 0000000..405d177
--- /dev/null
+++ b/README (conflicted copy 2022-05-12 102943).md
@@ -0,0 +1,241 @@
+
+# Docker-compose by PAPAMICA
+
+
+
+
+
+
+
+ List of services |
+ How to use |
+ Add a new service
+
+
+
+
+These docker-compose allow you to deploy multiple services easily and quickly. You can use them with Portainer directly or via docker-compose commands.
+All docker-compose are commented and are configured using variables.
+
+They all include support for Traefik.
+
+You can deploye a compatible Docker environment with Portainer and Traefik with:
+
+https://github.com/PAPAMICA/docker-environment
+
+
+
+## List of services availables: (21)
+| Status | Service | Update | Maintainer |
+|:--:|--|--|--|
+| ✅ | adminer | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | bookstack | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | cachethq | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | etherpad | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | filebot | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | filebrowser | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | grafana | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | hastebin | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | jirafeau | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | keycloak | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | matomo | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | murmur | 2022-05-12 | Mickael "PAPAMICA" Asseline |
+| ✅ | nextcloud | 2022-05-11 | Mickael "PAPAMICA" Asseline |
+| ✅ | sinusbot | 2022-05-12 | Mickael "PAPAMICA" Asseline |
+| ✅ | teamspeak | 2022-05-12 | Mickael "PAPAMICA" Asseline |
+| ✅ | umami | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | vaultwarden | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | vscode | 2022-05-11 | Mickael "PAPAMICA" Asseline |
+| ✅ | website-html | 2022-05-10 | Mickael "PAPAMICA" Asseline |
+| ✅ | wordpress | 2022-05-11 | Mickael "PAPAMICA" Asseline |
+| ✅ | zabbix | 2022-05-11 | Mickael "PAPAMICA" Asseline |
+
+## List of services to do: (99)
+| Status | Service |
+|:--:|--|
+| 🚸 | adguard |
+| 🚸 | airsonic |
+| 🚸 | apprise-api |
+| 🚸 | audacity |
+| 🚸 | authelia |
+| 🚸 | bazarr |
+| 🚸 | calibre-web |
+| 🚸 | chevereto |
+| 🚸 | dashmachine |
+| 🚸 | deemix |
+| 🚸 | deluge |
+| 🚸 | domotics |
+| 🚸 | duplicaty |
+| 🚸 | elasticsearch |
+| 🚸 | emby |
+| 🚸 | embystat |
+| 🚸 | emulatorjs |
+| 🚸 | freshrss |
+| 🚸 | gitlab |
+| 🚸 | grav |
+| 🚸 | guacamole |
+| 🚸 | heimdall |
+| 🚸 | homeassistant |
+| 🚸 | homer |
+| 🚸 | httpd |
+| 🚸 | jacket |
+| 🚸 | jellyfin |
+| 🚸 | jenkins |
+| 🚸 | joomla |
+| 🚸 | lidarr |
+| 🚸 | lychee |
+| 🚸 | magento |
+| 🚸 | mariadb |
+| 🚸 | mautic |
+| 🚸 | mcmyadmin2 |
+| 🚸 | minetest |
+| 🚸 | minio |
+| 🚸 | n8m |
+| 🚸 | nginx-proxy-manager |
+| 🚸 | nginx |
+| 🚸 | nzbget |
+| 🚸 | ombi |
+| 🚸 | openvpn-as |
+| 🚸 | openvpn |
+| 🚸 | organizr |
+| 🚸 | owncoud |
+| 🚸 | paperless-ng |
+| 🚸 | papermerge |
+| 🚸 | petio |
+| 🚸 | phpmyadmin |
+| 🚸 | pi-hole |
+| 🚸 | piwigo |
+| 🚸 | pixapop |
+| 🚸 | plex |
+| 🚸 | plone |
+| 🚸 | postgresql |
+| 🚸 | privatebin |
+| 🚸 | projectsend |
+| 🚸 | prowlarr |
+| 🚸 | radarr |
+| 🚸 | raneto |
+| 🚸 | rdesktop |
+| 🚸 | reactive-resume |
+| 🚸 | redis |
+| 🚸 | redmine |
+| 🚸 | registry |
+| 🚸 | requestrr |
+| 🚸 | rutorrent |
+| 🚸 | scality-s3 |
+| 🚸 | scrutiny |
+| 🚸 | shiori |
+| 🚸 | shorturl |
+| 🚸 | snapdrop |
+| 🚸 | snibox |
+| 🚸 | snipe-it |
+| 🚸 | sonarr |
+| 🚸 | taiga |
+| 🚸 | tautulli |
+| 🚸 | thelounge |
+| 🚸 | tiddlywiki |
+| 🚸 | tiny-tiny-rss |
+| 🚸 | traefik |
+| 🚸 | transmission |
+| 🚸 | ts3rank |
+| 🚸 | ts3viewer |
+| 🚸 | unify-controller |
+| 🚸 | urbackup |
+| 🚸 | vault |
+| 🚸 | webtop |
+| 🚸 | whoogle |
+| 🚸 | wikijs |
+| 🚸 | wireguard |
+| 🚸 | wiznote |
+| 🚸 | wowza |
+| 🚸 | yatch |
+| 🚸 | yourls |
+| 🚸 | youtube-dl |
+| 🚸 | zabbix-cachethq |
+| 🚸 | zabbix-proxy |
+---
+# Utilisation
+## Portainer
+Add the URL of my repo directly in Portainer:
+
+
+## Debian
+Install Git :
+```bash
+ apt install -y git
+```
+
+Clone repo
+```bash
+git clone https://github.com/PAPAMICA/docker-compose-collection/
+```
+
+
+Configuration of variables and execution of a docker-compose:
+```bash
+cd docker-compose-collection
+nano env
+sudo docker-compose -f service.yml --env-file env up -d
+```
+## Some useful commands:
+
+- **docker container ls** : Show current Docker containers
+- **docker-compose stop** : Stop the containers created with the scripts (in the script folder)
+- **docker-compose up -d** : Launch the containers created with the scripts (in the script folder)
+- **docker logs -f ** : Display the container logs
+- **docker exec -it bash** : Get a shell in container
+
+---
+# Add new docker-compose file
+I automated the creation of the json template file for Portainer and the update of the README.md.
+
+If you want to add a new docker-compose, you must use the following template:
+```yaml
+# Docker-compose provided by Mickael "PAPAMICA" Asseline
+# Update: 2022-10-05
+
+#& type: 3
+#& title: Hastebin
+#& description: Share your code easily
+#& note: Website: Hastebin.com
+#& categories: SelfHosted, PAPAMICA
+#& platform: linux
+#& logo: https://progsoft.net/images/hastebin-icon-b45e3f5695d3f577b2630648bd00584195822e3d.png
+
+#% SERVICE: Name of the service (No spaces or points)
+#% DATA_LOCATION: Data localization (Example: /apps/service)
+#% URL: Service URL (Example: service.papamica.fr or service.com)
+#% NETWORK: Your Traefik network (Example: proxy)
+
+# Work with Portainer
+version: "2"
+services:
+ # Hastebin : https://hastebin.com/about.md
+ hastebin:
+ image: rlister/hastebin:latest
+ container_name: $SERVICE
+ restart: always
+ environment:
+ STORAGE_TYPE: file
+ volumes:
+ - $DATA_LOCATION/data:/data
+ healthcheck:
+ test: wget -s 'http://localhost:7777'
+ interval: 1m
+ timeout: 30s
+ retries: 3
+ networks:
+ - default
+ labels:
+ - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater
+ - "traefik.enable=true"
+ - "traefik.http.routers.$SERVICE.entrypoints=https"
+ - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)"
+ - "traefik.http.routers.$SERVICE.tls=true"
+ - "traefik.http.routers.$SERVICE.tls.certresolver=http"
+ - "traefik.docker.network=$NETWORK"
+
+networks:
+ default:
+ external:
+ name: $NETWORK
+```
\ No newline at end of file
diff --git a/README.md b/README.md
index 405d177..b5ad7c9 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ https://github.com/PAPAMICA/docker-environment
-## List of services availables: (21)
+## List of services availables:
| Status | Service | Update | Maintainer |
|:--:|--|--|--|
| ✅ | adminer | 2022-05-10 | Mickael "PAPAMICA" Asseline |
@@ -50,7 +50,7 @@ https://github.com/PAPAMICA/docker-environment
| ✅ | wordpress | 2022-05-11 | Mickael "PAPAMICA" Asseline |
| ✅ | zabbix | 2022-05-11 | Mickael "PAPAMICA" Asseline |
-## List of services to do: (99)
+## List of services to do:
| Status | Service |
|:--:|--|
| 🚸 | adguard |
diff --git a/composes-files/mumble-bot b/composes-files/mumble-bot.yml
similarity index 100%
rename from composes-files/mumble-bot
rename to composes-files/mumble-bot.yml
diff --git a/composes-files/mumble-web.yml b/composes-files/mumble-web.yml
new file mode 100644
index 0000000..10369ae
--- /dev/null
+++ b/composes-files/mumble-web.yml
@@ -0,0 +1,44 @@
+# Maintainer: Mickael "PAPAMICA" Asseline
+# Update: 2022-05-12
+
+#& type: 3
+#& title: Mumble Web
+#& description: Web client for Mumble
+#& note: Website: Github.com
+#& categories: SelfHosted, PAPAMICA
+#& platform: linux
+#& logo: https://www.pngkey.com/png/full/319-3198756_rainbow-six-siege-mumble-logo-png.png
+
+#% SERVICE: Name of the service (No spaces or points)
+#% DATA_LOCATION: Data localization (Example: /apps/service)
+#% URL: Service URL (Example: service.papamica.fr or service.com)
+#% NETWORK: Your Traefik network (Example: proxy)
+#% MUMBLE_SERVER: Your mumble server
+
+# Work with Portainer
+version: "2"
+services:
+ murmur:
+ image: rankenstein/mumble-web
+ restart: always
+ container_name: $SERVICE
+ environment:
+ - MUMBLE_SERVER=$MUMBLE_SERVER
+ - UID=1000
+ - GID=1000
+ labels:
+ - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater
+ - "traefik.enable=true"
+ - "traefik.http.routers.$SERVICE.entrypoints=https"
+ - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)"
+ - "traefik.http.routers.$SERVICE.tls=true"
+ - "traefik.http.routers.$SERVICE.tls.certresolver=http"
+ - "traefik.docker.network=$NETWORK"
+ networks:
+ - default
+
+networks:
+ default:
+ external:
+ name: $NETWORK
+
\ No newline at end of file
diff --git a/composes-files/turtl.yml b/composes-files/turtl.yml
new file mode 100644
index 0000000..e69de29