diff --git a/.env.sample b/.env.sample
index 9f479d8..459729a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1 +1,3 @@
+TRAEFIK_DOMAIN=mydomain.com
+ACME_MAIL=my-email@my-provider.com
 PORTAINER_ADMIN_PASSWORD=h4ckMePleAse
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 894ad30..fce40c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 
 /config
 tunnel-options.sh
-traefik/.env
 .env
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d90b15..85fe917 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,11 @@ version: '3'
 
 networks:
     main:
-
+    webgateway:
+        driver: bridge
+    web:
+        external:
+            name: traefik_webgateway
 volumes:
     config:
         driver: local-persist
@@ -28,6 +32,23 @@ services:
     #     env_file:
     #         - config
 
+    services:
+    traefik:
+        image: traefik
+        container_name: traefik
+        restart: always
+        networks:
+            - webgateway
+        command: --acme.email=${ACME_MAIL} --docker.domain=${TRAEFIK_DOMAIN}
+        ports:
+            - "80:80"
+            - "443:443"
+            - "8080:8080"
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+            - ./traefik.toml:/traefik.toml
+            - /opt/traefik/acme.json:/acme.json
+
     deluge:
         image: fromenje/seedbox:deluge
         build: Dockerfiles/deluge
@@ -122,13 +143,10 @@ services:
             - /var/run/docker.sock:/var/run/docker.sock
         networks:
             - web
-        env_file:
-            - .env
-            - traefik/.env
         command: --admin-password ${PORTAINER_ADMIN_PASSWORD} --host=unix:///var/run/docker.sock
         labels:
             - 'traefik.backend=portainer'
             - 'traefik.port=9000'
             - 'traefik.frontend.rule=Host:portainer.${TRAEFIK_DOMAIN}'
-            - "traefik.enable=true"
+            - 'traefik.enable=true'
 
diff --git a/traefik/init-traefik.sh b/init-traefik.sh
similarity index 100%
rename from traefik/init-traefik.sh
rename to init-traefik.sh
diff --git a/traefik/traefik.toml b/traefik.toml
similarity index 100%
rename from traefik/traefik.toml
rename to traefik.toml
diff --git a/traefik/.env.sample b/traefik/.env.sample
deleted file mode 100644
index eb47b57..0000000
--- a/traefik/.env.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-ACME_MAIL=my-email@my-provider.com
-TRAEFIK_DOMAIN=mydomain.com
diff --git a/traefik/traefik.yml b/traefik/traefik.yml
deleted file mode 100644
index d5a59da..0000000
--- a/traefik/traefik.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    image: traefik
-    container_name: traefik
-    restart: always
-    env_file:
-     - ./.env
-    networks:
-      - webgateway
-    command: --acme.email=${ACME_MAIL} --docker.domain=${TRAEFIK_DOMAIN}
-    ports:
-      - "80:80"
-      - "443:443"
-      - "8080:8080"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./traefik.toml:/traefik.toml
-      - /opt/traefik/acme.json:/acme.json
-
-networks:
-  webgateway:
-    driver: bridge