diff --git a/thunderbird/docker-compose.yml b/thunderbird/docker-compose.yml
index 5f2cb04..3c2fcea 100644
--- a/thunderbird/docker-compose.yml
+++ b/thunderbird/docker-compose.yml
@@ -2,13 +2,17 @@ services:
   thunderbird:
     image: ${THUNDERBIRD_IMAGE:-jlesage/thunderbird}
     restart: unless-stopped
+    volumes:
+      - "${VOL_PATH:-./data}/thunderbird/config:/config:rw"
+      - "${VOL_PATH:-./data}/thunderbird/export:/export:rw"
     environment:
       - TZ=${THUNDERBIRD_TZ:-America/Vancouver}
       - WEB_AUTHENTICATION=${THUNDERBIRD_WEB_AUTHENTICATION:-1}
       - WEB_AUTHENTICATION_USERNAME=${THUNDERBIRD_WEB_AUTHENTICATION_USERNAME:-user}
       - WEB_AUTHENTICATION_PASSWORD=${THUNDERBIRD_WEB_AUTHENTICATION_PASSWORD:-password}
       - SECURE_CONNECTION=${THUNDERBIRD_SECURE_CONNECTION:-1}
-    volumes:
-      - "${VOL_PATH:-/tmp}/thunderbird:/config:rw"
     ports:
       - "5800:5800"
+    networks:
+      - proxy
+      - internal
diff --git a/thunderbird/sample.env b/thunderbird/sample.env
index 758fc13..4c7f8f5 100644
--- a/thunderbird/sample.env
+++ b/thunderbird/sample.env
@@ -1,11 +1,5 @@
-# Global
-VOL_PATH=/docker/vol/thunderbird-data #HELP: volpath
-COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
-
-# Thunderbird
-THUNDERBIRD_TZ=America/Vancouver
-THUNDERBIRD_IMAGE=jlesage/thunderbird
+THUNDERBIRD_IMAGE=jlesage/thunderbird:latest
 THUNDERBIRD_WEB_AUTHENTICATION=1
 THUNDERBIRD_WEB_AUTHENTICATION_USERNAME=user
 THUNDERBIRD_WEB_AUTHENTICATION_PASSWORD=password
-THUNDERBIRD_SECURE_CONNECTION=1
\ No newline at end of file
+THUNDERBIRD_SECURE_CONNECTION=1