diff --git a/tasks/traggo.yml b/tasks/traggo.yml
deleted file mode 100644
index edc71cd..0000000
--- a/tasks/traggo.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "/data/traggo"
-    - "/data/traggo/data"
-
-- name: Create the traggo container
-  docker_container:
-    name: traggo
-    image: traggo/server:0.7.1
-    restart_policy: unless-stopped
-    networks:
-      - name: proxy
-    volumes:
-      - /data/traggo/data:/opt/traggo/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.traggo.rule: "Host(`traggo.comprofix.xyz`)"
-      traefik.http.routers.traggo.entrypoints: "https"
-      traefik.http.routers.traggo.tls: "true"
-      traefik.http.services.traggo.loadbalancer.server.port: "3030"
-      traefik.http.services.traggo.loadbalancer.server.scheme: "http"
diff --git a/tasks/vaultwarden.yml b/tasks/vaultwarden.yml
index 7925f9c..ccc86df 100644
--- a/tasks/vaultwarden.yml
+++ b/tasks/vaultwarden.yml
@@ -9,11 +9,18 @@
     - "/data/vaultwardenbackup"
     - "/data/vaultwardenbackup/config"
     - "/data/vaultwardenbackup/config/rclone"
+
+- name: Pull docker image
+  community.docker.docker_image:
+    image: vaultwarden/server
+    tag: 1.34.3
+    source: pull
+  register: docker_image
   
 - name: Create the vaultwarden container
   docker_container:
     name: vaultwarden
-    image: vaultwarden/server:1.34.3
+    image: "{{ docker_image.image.RepoTags[0] }}"
     restart_policy: unless-stopped
     networks:
       - name: proxy
@@ -30,7 +37,8 @@
       traefik.http.routers.vaultwarden.tls: "true"
       traefik.http.routers.vaultwarden.service: "vaultwarden"
       traefik.http.services.vaultwarden.loadbalancer.server.port: "80"
-  register: container
+  when: docker_image.changed
+  register: container_vaultwarden
 
 - name: Copy rclone config
   copy:
@@ -39,12 +47,18 @@
     decrypt: yes
     mode: "0600"
 
+- name: Pull docker image
+  community.docker.docker_image:
+    image: ttionya/vaultwarden-backup
+    tag: 1.25.2
+    source: pull
+  register: docker_image
+
 - name: Create the vaultwarden container
   docker_container:
     name: vaultwardenbackup
-    image: ttionya/vaultwarden-backup:1.25.2
+    image: "{{ docker_image.image.RepoTags[0] }}"
     restart_policy: unless-stopped
-    
     env:
       PUID: "1000"
       PGID: "1000"
@@ -55,7 +69,8 @@
     volumes:
       - "/data/vaultwarden/data:/bitwarden/data"
       - "/data/vaultwardenbackup/config:/config"
-  register: container
+  when: docker_image.changed
+  register: container_vaultwardenbackup