diff --git a/README.md b/README.md
index ff8fca7..8b0ee33 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ All services below are running under Docker, except NSD and Borg.
 - Host tobb website?
 - Move from Ubuntu to Debian
 - move to pim.kunis.nl
+- security.txt
+- Podman
+- Replace watchtower with Podman features
 
 ### NSD
 
diff --git a/playbooks/all.yml b/playbooks/all.yml
index 8f7243f..7667947 100644
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -2,6 +2,7 @@
   hosts: homeserver
   roles:
     - {role: 'ssh', tags: 'ssh'}
+    - {role: 'watchtower', tags: 'watchtower'}
     - {role: 'borg', tags: 'borg'}
     - {role: 'nsd', tags: 'nsd'}
     - {role: 'forgejo', tags: 'forgejo'}
diff --git a/roles/syncthing/templates/docker-compose.yml.j2 b/roles/syncthing/templates/docker-compose.yml.j2
index 512eef6..c8e1a5f 100644
--- a/roles/syncthing/templates/docker-compose.yml.j2
+++ b/roles/syncthing/templates/docker-compose.yml.j2
@@ -4,6 +4,8 @@ services:
   syncthing:
     image: lscr.io/linuxserver/syncthing:latest
     container_name: syncthing
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
     hostname: syncthing
     environment:
       - PUID=1000
diff --git a/roles/watchtower/files/docker-compose.yml b/roles/watchtower/files/docker-compose.yml
new file mode 100644
index 0000000..28f892e
--- /dev/null
+++ b/roles/watchtower/files/docker-compose.yml
@@ -0,0 +1,8 @@
+version: "3"
+services:
+  watchtower:
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --schedule "0 0 4 * * *" --include-restarting --cleanup --include-stopped --no-startup-message
+    restart: always
diff --git a/roles/watchtower/meta/main.yml b/roles/watchtower/meta/main.yml
new file mode 100644
index 0000000..7f5b1d3
--- /dev/null
+++ b/roles/watchtower/meta/main.yml
@@ -0,0 +1,4 @@
+dependencies:
+  - role: common
+  - role: docker
+  
\ No newline at end of file
diff --git a/roles/watchtower/tasks/main.yml b/roles/watchtower/tasks/main.yml
new file mode 100644
index 0000000..2518ba7
--- /dev/null
+++ b/roles/watchtower/tasks/main.yml
@@ -0,0 +1,14 @@
+- name: Create app directory
+  file:
+    path: "{{ service_dir }}"
+    state: directory
+- name: Copy Docker Compose script
+  copy:
+    src: "{{ role_path }}/files/docker-compose.yml"
+    dest: "{{ service_dir }}/docker-compose.yml"
+- name: Start the Docker Compose
+  docker_compose:
+    project_src: "{{ service_dir }}"
+    pull: true
+    remove_orphans: true
+
diff --git a/roles/watchtower/vars/main.yml b/roles/watchtower/vars/main.yml
new file mode 100644
index 0000000..6b39621
--- /dev/null
+++ b/roles/watchtower/vars/main.yml
@@ -0,0 +1,2 @@
+service_name: watchtower
+service_dir: "{{ base_service_dir }}/{{ service_name }}"