diff --git a/states/nextcloud_desktop/defaults.yaml b/states/nextcloud_desktop/defaults.yaml
index 23b8029..fe5cae1 100644
--- a/states/nextcloud_desktop/defaults.yaml
+++ b/states/nextcloud_desktop/defaults.yaml
@@ -1,5 +1,7 @@
 ---
 nextcloud_desktop:
   url: https://download.nextcloud.com/desktop/releases/Linux
-  dest_path: /usr/local/bin/nextcloud
-  version: 3.0.1
+  dest_path: /usr/local/bin
+  install_dir: /usr/local/apps
+  release_dir: /usr/local/apps/releases
+  version: 3.16.6
diff --git a/states/nextcloud_desktop/init.sls b/states/nextcloud_desktop/init.sls
index bdcfe43..fc6c7a9 100644
--- a/states/nextcloud_desktop/init.sls
+++ b/states/nextcloud_desktop/init.sls
@@ -1,19 +1,28 @@
 ---
 {%- from "nextcloud_desktop/map.jinja" import nextcloud_desktop with context %}
+nextcloud-desktop-dir:
+  file.directory:
+    - name: {{ nextcloud_desktop.release_dir }}/nextcloud-desktop-{{ nextcloud_desktop.version }}
+    - user: root
+    - group: root
+    - mode: "0755"
+
 nextcloud-desktop-appimage:
   file.managed:
-    - name: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
+    - name: {{ nextcloud_desktop.release_dir }}/nextcloud-desktop-{{ nextcloud_desktop.version }}/nextcloud
     - source: {{ nextcloud_desktop.url }}/Nextcloud-{{ nextcloud_desktop.version }}-x86_64.AppImage
     - skip_verify: true
     - user: root
     - group: root
     - mode: "0755"
-    - if_missing: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
+    - if_missing: {{ nextcloud_desktop.release_dir }}/nextcloud-desktop-{{ nextcloud_desktop.version }}/nextcloud
+    - require:
+      - file: nextcloud-desktop-dir
 
 nextcloud-desktop-install-link:
   file.symlink:
-    - name: {{ nextcloud_desktop.dest_path }}
-    - target: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
+    - name: {{ nextcloud_desktop.dest_path }}/nextcloud
+    - target: {{ nextcloud_desktop.release_dir }}/nextcloud-desktop-{{ nextcloud_desktop.version }}/nextcloud
     - force: true
     - watch:
       - file: nextcloud-desktop-appimage