diff --git a/.gitignore b/.gitignore
index 91adc1b..3fb8e93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,5 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+config.json
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 98cc010..dea4946 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,14 +6,24 @@ volumes:
   rabbitmq_data:
 
 services:
+  watchtower:
+    image: containrrr/watchtower
+    container_name: watchtower
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./config.json:/config.json
+    environment:
+      - DOCKER_CONFIG=/
+      - WATCHTOWER_POLL_INTERVAL=60
+      - WATCHTOWER_LABEL_ENABLE=true
+
   gateway:
     image: registry.forge.hefr.ch/team-raclette/project-softweng/gateway:latest
     container_name: gateway
     restart: unless-stopped
     ports:
       - "8080:8080"
-    networks:
-      - kb28_default
     environment:
       - INFLUXDB_TOKEN=$INFLUXDB_TOKEN
       - INFLUXDB_ORG=$INFLUXDB_ORG
@@ -36,6 +46,9 @@ services:
       - "traefik.http.routers.Gateway-https.rule=Host(`rest.mse.kb28.ch`)"
       - "traefik.http.routers.Gateway-https.tls.certResolver=letsencrypt"
       - "traefik.http.services.Gateway-https.loadbalancer.server.port=8080"
+
+      - "com.centurylinklabs.watchtower.enable=true"
+
   influxdb:
     image: influxdb:2
     container_name: influxdb
@@ -62,6 +75,7 @@ services:
       - "traefik.http.routers.influx-https.rule=Host(`influx.mse.kb28.ch`)"
       - "traefik.http.routers.influx-https.tls.certResolver=letsencrypt"
       - "traefik.http.services.influx-https.loadbalancer.server.port=8086"
+
   rabbitmq:
     image: rabbitmq:3-management-alpine
     container_name: rabbitmq