diff --git a/Makefile b/Makefile
index 0e94061..b5105e6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ deploy: ## Deploy NetBox (requires vault password)
 	ansible-playbook -i inventory/hosts.yml playbooks/deploy-netbox.yml --vault-password-file .vault-password
 
 update: ## Update NetBox
-	ansible-playbook -i inventory/hosts.yml playbooks/update-netbox.yml --vault-password-file .vault-password
+	ansible-playbook -i inventory/hosts.yml playbooks/update-netbox.yml
 
 backup: ## Backup NetBox
-	ansible-playbook -i inventory/hosts.yml playbooks/backup-netbox.yml --vault-password-file .vault-password
+	ansible-playbook -i inventory/hosts.yml playbooks/backup-netbox.yml
 
 check-syntax: ## Check Ansible playbook syntax
 	ansible-playbook -i inventory/hosts.yml playbooks/deploy-netbox.yml --syntax-check
diff --git a/inventory/group_vars/netbox_servers.yml b/inventory/group_vars/netbox_servers.yml
index d50b7ce..94b1666 100644
--- a/inventory/group_vars/netbox_servers.yml
+++ b/inventory/group_vars/netbox_servers.yml
@@ -137,7 +137,6 @@ traefik_custom_ca_verify_ssl: false
 netbox_docker_compose_overrides:
   services:
     netbox:
-      restart: unless-stopped
       labels:
         - "traefik.enable=true"
         - "traefik.http.routers.netbox.rule=Host(`{{ netbox_domain }}`)"
@@ -147,23 +146,19 @@ netbox_docker_compose_overrides:
         - "traefik"
         - "netbox"
     netbox-worker:
-      restart: unless-stopped
       networks:
         - "netbox"
     postgres:
-      restart: unless-stopped
       networks:
         - "netbox"
       volumes:
         - "{{ netbox_data_dir }}/postgres:/var/lib/postgresql/data"
     redis:
-      restart: unless-stopped
       networks:
         - "netbox"
       volumes:
         - "{{ netbox_data_dir }}/redis:/data"
     redis-cache:
-      restart: unless-stopped
       networks:
         - "netbox"
       volumes:
diff --git a/inventory/group_vars/netbox_servers_vault.yml b/inventory/group_vars/netbox_servers_vault
similarity index 100%
rename from inventory/group_vars/netbox_servers_vault.yml
rename to inventory/group_vars/netbox_servers_vault
diff --git a/playbooks/deploy-netbox.yml b/playbooks/deploy-netbox.yml
index 081f64c..b43bf44 100644
--- a/playbooks/deploy-netbox.yml
+++ b/playbooks/deploy-netbox.yml
@@ -6,8 +6,7 @@
   
   pre_tasks:
     - name: Include vault variables
-      include_vars: 
-        dir: ../inventory/group_vars
+      include_vars: ../inventory/group_vars/netbox_servers_vault
       
     - name: Verify Ubuntu distribution
       fail:
diff --git a/playbooks/update-netbox.yml b/playbooks/update-netbox.yml
index 6541917..c49c714 100644
--- a/playbooks/update-netbox.yml
+++ b/playbooks/update-netbox.yml
@@ -3,12 +3,8 @@
   hosts: netbox
   become: yes
   gather_facts: no
-
+  
   tasks:
-    - name: Include vault variables
-      include_vars: 
-        dir: ../inventory/group_vars
-
     - name: Update NetBox Docker repository
       git:
         repo: "{{ netbox_repo_url }}"
@@ -19,15 +15,21 @@
       tags:
         - update-repo
 
-    - name: Pull and Restart latest Docker images
+    - name: Pull latest Docker images
       community.docker.docker_compose_v2:
         project_src: "{{ netbox_install_dir }}"
-        pull: always
-        state: present
-        recreate: auto
+        pull: yes
       tags:
         - pull-images
 
+    - name: Restart NetBox services
+      community.docker.docker_compose_v2:
+        project_src: "{{ netbox_install_dir }}"
+        state: present
+        recreate: yes
+      tags:
+        - restart-services
+
     - name: Wait for NetBox to be ready
       uri:
         url: "https://{{ netbox_domain }}/"