diff --git a/roles/ind/nas/nas-install.yml b/roles/ind/nas/nas-install.yml
index 5c74508..b404b34 100644
--- a/roles/ind/nas/nas-install.yml
+++ b/roles/ind/nas/nas-install.yml
@@ -19,23 +19,31 @@
     - name: Setup Restic Cron jobs
       include: ../../lib/setup-restic-cron.yml
 
+    # Install OMV prerequisites
+    - name: Install required packages
+      ansible.builtin.apt:
+        name:
+          - apt-transport-https
+          - ca-certificates
+          - gnupg
+        state: present
+
     - name: Add OpenMediaVault repository key
       ansible.builtin.get_url:
         url: https://packages.openmediavault.org/public/archive.key
-        dest: /usr/share/keyrings/openmediavault-archive-keyring.gpg
+        dest: /usr/share/keyrings/openmediavault-archive-keyring.asc
         mode: '0644'
-        force: true
 
     - name: Add OMV repository
       ansible.builtin.apt_repository:
         filename: openmediavault
-        repo: 'deb [signed-by=/usr/share/keyrings/openmediavault-archive-keyring.gpg] https://packages.openmediavault.org/public/ sandworm main'
+        repo: 'deb [signed-by=/usr/share/keyrings/openmediavault-archive-keyring.asc] https://packages.openmediavault.org/public/ sandworm main'
         state: present
 
     - name: Add OMV repository proposed updates
       ansible.builtin.apt_repository:
         filename: openmediavault
-        repo: 'deb [signed-by=/usr/share/keyrings/openmediavault-archive-keyring.gpg]] https://packages.openmediavault.org/public/ sandworm-proposed main'
+        repo: 'deb [signed-by=/usr/share/keyrings/openmediavault-archive-keyring.asc] https://packages.openmediavault.org/public/ sandworm-proposed main'
         state: present
 
     - name: Install Python Packages
@@ -46,15 +54,6 @@
         state: present
         update_cache: yes
 
-    # Install OMV prerequisites
-    - name: Install required packages
-      ansible.builtin.apt:
-        name:
-          - apt-transport-https
-          - ca-certificates
-          - gnupg
-        state: present
-
     - name: Install OpenMediaVault
       ansible.builtin.apt:
         name: openmediavault