diff --git a/ansible/playbooks/saas/roles/adguard/tasks/build.yml b/ansible/playbooks/saas/roles/adguard/tasks/build.yml
index 1fa59466..59dbe217 100644
--- a/ansible/playbooks/saas/roles/adguard/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/adguard/tasks/build.yml
@@ -11,7 +11,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Download Github release
   ansible.builtin.get_url:
diff --git a/ansible/playbooks/saas/roles/adguard/vars/upstream.yml b/ansible/playbooks/saas/roles/adguard/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/adguard/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/adguard/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/arangodb/tasks/build.yml b/ansible/playbooks/saas/roles/arangodb/tasks/build.yml
index 9bf114b1..d87dbb34 100644
--- a/ansible/playbooks/saas/roles/arangodb/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/arangodb/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
\ No newline at end of file
diff --git a/ansible/playbooks/saas/roles/arangodb/vars/upstream.yml b/ansible/playbooks/saas/roles/arangodb/vars/upstream.yml
index ee5f3470..498d63bc 100644
--- a/ansible/playbooks/saas/roles/arangodb/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/arangodb/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) }}"
+upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) | from_json }}"
 latest_version: "{{ upstream_versions | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/caddy/tasks/build.yml b/ansible/playbooks/saas/roles/caddy/tasks/build.yml
index b6119fe2..10ddbe37 100644
--- a/ansible/playbooks/saas/roles/caddy/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/caddy/tasks/build.yml
@@ -9,9 +9,15 @@
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
 
+- debug:
+    msg: 
+      - "{{ softwares }}"
+      - "{{ softwares[image.name] }}"
+      - "{{ image_version }}"
+
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Download Github release
   ansible.builtin.get_url:
diff --git a/ansible/playbooks/saas/roles/caddy/vars/upstream.yml b/ansible/playbooks/saas/roles/caddy/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/caddy/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/caddy/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/code_server/tasks/build.yml b/ansible/playbooks/saas/roles/code_server/tasks/build.yml
index 7421b506..68406697 100644
--- a/ansible/playbooks/saas/roles/code_server/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/code_server/tasks/build.yml
@@ -11,4 +11,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/code_server/vars/upstream.yml b/ansible/playbooks/saas/roles/code_server/vars/upstream.yml
index 67952cb2..c856b01f 100644
--- a/ansible/playbooks/saas/roles/code_server/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/code_server/vars/upstream.yml
@@ -1,2 +1,2 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN')}) | from_json).get('tag_name') | replace('v', '') }}"
\ No newline at end of file
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN')}) | from_json).get('tag_name') | replace('v', '') }}"
\ No newline at end of file
diff --git a/ansible/playbooks/saas/roles/dolibarr/tasks/build.yml b/ansible/playbooks/saas/roles/dolibarr/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/dolibarr/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/dolibarr/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/dolibarr/vars/upstream.yml b/ansible/playbooks/saas/roles/dolibarr/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/dolibarr/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/dolibarr/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/forgejo/tasks/build.yml b/ansible/playbooks/saas/roles/forgejo/tasks/build.yml
index b6abb4de..9ea08ee8 100644
--- a/ansible/playbooks/saas/roles/forgejo/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/forgejo/tasks/build.yml
@@ -11,7 +11,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Download Github release
   ansible.builtin.get_url:
diff --git a/ansible/playbooks/saas/roles/forgejo/vars/upstream.yml b/ansible/playbooks/saas/roles/forgejo/vars/upstream.yml
index f8d255f8..0a896c12 100644
--- a/ansible/playbooks/saas/roles/forgejo/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/forgejo/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://codeberg.org/api/v1/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest') | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://codeberg.org/api/v1/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest') | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://codeberg.org/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/freshrss/tasks/build.yml b/ansible/playbooks/saas/roles/freshrss/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/freshrss/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/freshrss/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/freshrss/vars/upstream.yml b/ansible/playbooks/saas/roles/freshrss/vars/upstream.yml
index aaec310c..75bb1771 100644
--- a/ansible/playbooks/saas/roles/freshrss/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/freshrss/vars/upstream.yml
@@ -1,5 +1,7 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
+
+
diff --git a/ansible/playbooks/saas/roles/grafana/tasks/build.yml b/ansible/playbooks/saas/roles/grafana/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/grafana/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/grafana/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/grafana/vars/upstream.yml b/ansible/playbooks/saas/roles/grafana/vars/upstream.yml
index 78571db2..71494a32 100644
--- a/ansible/playbooks/saas/roles/grafana/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/grafana/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) }}"
+upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) | from_json }}"
 latest_version: "{{ upstream_versions | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ github.user }}/{{ github.repo }}/archive/refs/tags/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/homeassistant/tasks/build.yml b/ansible/playbooks/saas/roles/homeassistant/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/homeassistant/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/homeassistant/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/homeassistant/vars/upstream.yml b/ansible/playbooks/saas/roles/homeassistant/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/homeassistant/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/homeassistant/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/kresus/tasks/build.yml b/ansible/playbooks/saas/roles/kresus/tasks/build.yml
index 208e4ad8..8fd0f814 100644
--- a/ansible/playbooks/saas/roles/kresus/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/kresus/tasks/build.yml
@@ -11,7 +11,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Copy config file
   ansible.builtin.copy:
diff --git a/ansible/playbooks/saas/roles/loki/tasks/build.yml b/ansible/playbooks/saas/roles/loki/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/loki/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/loki/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/loki/vars/upstream.yml b/ansible/playbooks/saas/roles/loki/vars/upstream.yml
index 93a3058a..c1538738 100644
--- a/ansible/playbooks/saas/roles/loki/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/loki/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) }}"
+upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) | from_json }}"
 latest_version: "{{ upstream_versions | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS',  image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/mariadb/tasks/build.yml b/ansible/playbooks/saas/roles/mariadb/tasks/build.yml
index c47ee8ea..9ed68d21 100644
--- a/ansible/playbooks/saas/roles/mariadb/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/mariadb/tasks/build.yml
@@ -5,3 +5,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/mimir/tasks/build.yml b/ansible/playbooks/saas/roles/mimir/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/mimir/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/mimir/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/mimir/vars/upstream.yml b/ansible/playbooks/saas/roles/mimir/vars/upstream.yml
index 347b00df..718bd5be 100644
--- a/ansible/playbooks/saas/roles/mimir/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/mimir/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN')}) | from_json).get('tag_name') | replace('mimir-', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN')}) | from_json).get('tag_name') | replace('mimir-', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/grafana/mimir/releases/tag/mimir-{{ latest_version }}.tar.gz"
diff --git a/ansible/playbooks/saas/roles/minio/tasks/build.yml b/ansible/playbooks/saas/roles/minio/tasks/build.yml
index 146d69a8..23cc4525 100644
--- a/ansible/playbooks/saas/roles/minio/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/minio/tasks/build.yml
@@ -11,7 +11,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Download latest release
   ansible.builtin.get_url:
diff --git a/ansible/playbooks/saas/roles/minio/vars/upstream.yml b/ansible/playbooks/saas/roles/minio/vars/upstream.yml
index 9093830b..ceedd293 100644
--- a/ansible/playbooks/saas/roles/minio/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/minio/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ latest_version }}"
 upstream_file_url: "https://dl.min.io/server/minio/release/linux-{{ upstream_default_arch }}/minio"
diff --git a/ansible/playbooks/saas/roles/mosquitto/tasks/build.yml b/ansible/playbooks/saas/roles/mosquitto/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/mosquitto/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/mosquitto/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/mosquitto/vars/upstream.yml b/ansible/playbooks/saas/roles/mosquitto/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/mosquitto/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/mosquitto/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/nextcloud/tasks/build.yml b/ansible/playbooks/saas/roles/nextcloud/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/nextcloud/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/nextcloud/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/nextcloud/vars/upstream.yml b/ansible/playbooks/saas/roles/nextcloud/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/nextcloud/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/nextcloud/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/nginx/tasks/build.yml b/ansible/playbooks/saas/roles/nginx/tasks/build.yml
index 8c714338..7eb8a83f 100644
--- a/ansible/playbooks/saas/roles/nginx/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/nginx/tasks/build.yml
@@ -13,7 +13,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Copy boilerplate configuration snippets files
   ansible.builtin.copy:
diff --git a/ansible/playbooks/saas/roles/nginx/vars/main.yml b/ansible/playbooks/saas/roles/nginx/vars/main.yml
index 0dcfd33b..f1b1af4a 100644
--- a/ansible/playbooks/saas/roles/nginx/vars/main.yml
+++ b/ansible/playbooks/saas/roles/nginx/vars/main.yml
@@ -11,5 +11,3 @@ image:
   origin: alpine:latest
   dependances:
     - nginx
-
-nginx_version: 1.26.2
diff --git a/ansible/playbooks/saas/roles/nodejs/tasks/build.yml b/ansible/playbooks/saas/roles/nodejs/tasks/build.yml
index d57cd51b..cb9e8347 100644
--- a/ansible/playbooks/saas/roles/nodejs/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/nodejs/tasks/build.yml
@@ -13,7 +13,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Copy dockerfile
   ansible.builtin.template:
diff --git a/ansible/playbooks/saas/roles/open-webui/tasks/build.yml b/ansible/playbooks/saas/roles/open-webui/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/open-webui/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/open-webui/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/open-webui/vars/upstream.yml b/ansible/playbooks/saas/roles/open-webui/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/open-webui/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/open-webui/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/phpfpm/tasks/build.yml b/ansible/playbooks/saas/roles/phpfpm/tasks/build.yml
index d57cd51b..cb9e8347 100644
--- a/ansible/playbooks/saas/roles/phpfpm/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/phpfpm/tasks/build.yml
@@ -13,7 +13,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Copy dockerfile
   ansible.builtin.template:
diff --git a/ansible/playbooks/saas/roles/postgresql/tasks/build.yml b/ansible/playbooks/saas/roles/postgresql/tasks/build.yml
index fa61e162..f28cf257 100644
--- a/ansible/playbooks/saas/roles/postgresql/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/postgresql/tasks/build.yml
@@ -8,4 +8,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/registry/tasks/build.yml b/ansible/playbooks/saas/roles/registry/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/registry/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/registry/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/rocketchat/tasks/build.yml b/ansible/playbooks/saas/roles/rocketchat/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/rocketchat/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/rocketchat/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/rocketchat/vars/upstream.yml b/ansible/playbooks/saas/roles/rocketchat/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/rocketchat/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/rocketchat/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/simplestack_ansible/tasks/build.yml b/ansible/playbooks/saas/roles/simplestack_ansible/tasks/build.yml
index 7421b506..1f0c5e0c 100644
--- a/ansible/playbooks/saas/roles/simplestack_ansible/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/simplestack_ansible/tasks/build.yml
@@ -11,4 +11,5 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
+
diff --git a/ansible/playbooks/saas/roles/simplestack_ansible/vars/upstream.yml b/ansible/playbooks/saas/roles/simplestack_ansible/vars/upstream.yml
index 7ba80d95..bd4fe371 100644
--- a/ansible/playbooks/saas/roles/simplestack_ansible/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/simplestack_ansible/vars/upstream.yml
@@ -1,2 +1,2 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
\ No newline at end of file
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
\ No newline at end of file
diff --git a/ansible/playbooks/saas/roles/simplestack_ui/tasks/build.yml b/ansible/playbooks/saas/roles/simplestack_ui/tasks/build.yml
index 7421b506..68406697 100644
--- a/ansible/playbooks/saas/roles/simplestack_ui/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/simplestack_ui/tasks/build.yml
@@ -11,4 +11,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/traefik/tasks/build.yml b/ansible/playbooks/saas/roles/traefik/tasks/build.yml
index 7421b506..68406697 100644
--- a/ansible/playbooks/saas/roles/traefik/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/traefik/tasks/build.yml
@@ -11,4 +11,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/traefik/vars/upstream.yml b/ansible/playbooks/saas/roles/traefik/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/traefik/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/traefik/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/valkey/tasks/build.yml b/ansible/playbooks/saas/roles/valkey/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/valkey/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/valkey/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/valkey/vars/upstream.yml b/ansible/playbooks/saas/roles/valkey/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/valkey/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/valkey/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/vector/tasks/build.yml b/ansible/playbooks/saas/roles/vector/tasks/build.yml
index 7421b506..68406697 100644
--- a/ansible/playbooks/saas/roles/vector/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/vector/tasks/build.yml
@@ -11,4 +11,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/vector/vars/upstream.yml b/ansible/playbooks/saas/roles/vector/vars/upstream.yml
index 03927468..fa90cda8 100644
--- a/ansible/playbooks/saas/roles/vector/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/vector/vars/upstream.yml
@@ -1,3 +1,3 @@
 ---
-upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) }}"
+upstream_versions: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') })) }}"
 latest_version: "{{ upstream_versions | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
diff --git a/ansible/playbooks/saas/roles/vllm/tasks/build.yml b/ansible/playbooks/saas/roles/vllm/tasks/build.yml
index 7421b506..68406697 100644
--- a/ansible/playbooks/saas/roles/vllm/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/vllm/tasks/build.yml
@@ -11,4 +11,4 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/vllm/vars/upstream.yml b/ansible/playbooks/saas/roles/vllm/vars/upstream.yml
index 036aa64c..df805dec 100644
--- a/ansible/playbooks/saas/roles/vllm/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/vllm/vars/upstream.yml
@@ -1,4 +1,4 @@
 ---
-latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
+latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}"
 upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}"
diff --git a/ansible/playbooks/saas/roles/wordpress/tasks/build.yml b/ansible/playbooks/saas/roles/wordpress/tasks/build.yml
index a7e598c7..f02d47f4 100644
--- a/ansible/playbooks/saas/roles/wordpress/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/wordpress/tasks/build.yml
@@ -13,7 +13,7 @@
 
 - name: End playbook if no new version
   ansible.builtin.meta: end_host
-  when: softwares[image.name] is defined and softwares[image.name] == image_version
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
 
 - name: Download wp-cli
   ansible.builtin.get_url:
diff --git a/ansible/playbooks/saas/roles/zigbee2mqtt/tasks/build.yml b/ansible/playbooks/saas/roles/zigbee2mqtt/tasks/build.yml
index 9bf114b1..68406697 100644
--- a/ansible/playbooks/saas/roles/zigbee2mqtt/tasks/build.yml
+++ b/ansible/playbooks/saas/roles/zigbee2mqtt/tasks/build.yml
@@ -8,3 +8,7 @@
     image_name: "{{ image.name }}"
     image_labels: "{{ image.labels }}"
     image_build: "{{ image.build }}"
+
+- name: End playbook if no new version
+  ansible.builtin.meta: end_host
+  when: softwares[image.name] is defined and softwares[image.name].version == image_version
diff --git a/ansible/playbooks/saas/roles/zigbee2mqtt/vars/upstream.yml b/ansible/playbooks/saas/roles/zigbee2mqtt/vars/upstream.yml
index aaec310c..64224769 100644
--- a/ansible/playbooks/saas/roles/zigbee2mqtt/vars/upstream.yml
+++ b/ansible/playbooks/saas/roles/zigbee2mqtt/vars/upstream.yml
@@ -1,5 +1,5 @@
 ---
-upstream_version: "{{ lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) }}"
+upstream_version: "{{ lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json }}"
 latest_version: "{{ upstream_version | community.general.json_query('[].name') | select('match', '^(v|r)?\\d{1,4}(\\.\\d{1,4})(\\.\\d{1,4})$') | community.general.version_sort | last | replace('v', '') }}"
 upstream_file_name: "{{ upstream.source.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', upstream.source.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', upstream.source.format) }}"
 upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/archive/{{ upstream_file_name }}"
diff --git a/ui/index.js.map b/ui/index.js.map
index 4ec58e03..aa87a415 100644
--- a/ui/index.js.map
+++ b/ui/index.js.map
@@ -99,8 +99,7 @@
 			"url": "/api/",
 			"auth": 1,
 			"id": "search",
-			"name": "Search item",
-			"query": "q:String"
+			"name": "Search item"
 		},
 		{
 			"method": "API",
@@ -466,8 +465,7 @@
 			"input": "*action:{start|stop|main|backup|restore|destroy}"
 		},
 		{
-			"name": "Spotlight/search",
-			"query": "q:String"
+			"name": "Spotlight/search"
 		},
 		{
 			"name": "Users/list",
diff --git a/ui/public/css/default.css b/ui/public/css/default.css
index 0f1a9651..973a68a0 100644
--- a/ui/public/css/default.css
+++ b/ui/public/css/default.css
@@ -1,4 +1,8 @@
-html,body { overflow: hidden; margin: 0; padding: 0; color: #303030; }
+html,body { overflow: hidden; margin: 0; padding: 0; color: #303030; overscroll-behavior: none; }
+
+:root {
+	--radius: 5px;
+}
 
 .ui-dark h2 { border-bottom-color: #404040; color: #FFF; }
 
@@ -6,6 +10,7 @@ html,body { overflow: hidden; margin: 0; padding: 0; color: #303030; }
 .bg-smoke { background-color: #F8F8F8; }
 .bg-body { background-color: #FFF; }
 .monospace { font-family: Menlo, Consolas, monospace; }
+.ti { transform: none; }
 
 .ui-dark .bg-smoke { background-color: #151515; }
 .ui-dark .bg-body { background-color: #232323; }
@@ -31,12 +36,10 @@ header .toolbar button { height: 26px; font-size: 12px; }
 .header button:disabled i, .toolbar button:disabled i { color: silver !important; }
 .header button.right, .toolbar button.right { float: right; margin-left: 5px; margin-right: 0; text-align: center; }
 
-.mainmenu { height: 30px; width: 30px; float: left; font-size: 16px; line-height: 30px; text-align: center; margin: 15px 10px 0 15px; cursor: pointer; background-color: #F0F0F0; border-radius: var(--radius); }
-.mainmenu:hover { background-color: #F5F5F5; }
+.mainmenu { height: 32px; width: 32px; float: left; font-size: 18px; line-height: 31px; text-align: center; margin: 14px 10px 0 15px; cursor: pointer; background-color: var(--color); border-radius: var(--radius); color: #FFF; }
+.mainmenu i { transform: scale(1); }
 
 .ui-dark .mainmenu { background-color: #404040; }
-.ui-dark .mainmenu:hover { background-color: #454545; }
-
 .ui-dark .header button, .ui-dark  .toolbar button { background: linear-gradient(#323232,#353535); border-color: #404040; color: #FFF; }
 .ui-dark .header button:hover, .ui-dark  .toolbar button:hover { border-top-color: #505050; border-bottom-color: #505050; }
 .ui-dark .header button:disabled, .ui-dark .toolbar button:disabled { color: #505050; border-color: #353535 !important; background: linear-gradient(#202020,#252525); }
@@ -111,15 +114,15 @@ header .toolbar button { height: 26px; font-size: 12px; }
 .bb { border-bottom: 1px solid #E0E0E0; }
 .ui-dark .bb { border-bottom: 1px solid #333; }
 
-.ui-windows-item { box-shadow: 2px 4px 20px rgba(0,0,0,0.2); }
+.ui-windows-item { box-shadow: 2px 4px 20px rgba(0,0,0,0.15); }
 .ui-edit-window { z-index: 20; }
 
 .users > span, .users > img { margin-left: 5px; padding: 0; border-radius: 100px; line-height: 22px; color: #FFF; width: 22px; height: 22px; text-align: center; display: inline-block; }
 .users > span:first-child { margin-left: 0; }
 
-.searchprojects { padding: 5px 13px; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; }
-.searchprojects .ui-searchinput { border: 0; background-color: transparent; }
-.searchprojects .ui-searchinput input { background-color: transparent; }
+.searchfolders { padding: 5px 13px; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; }
+.searchfolders .ui-searchinput { border: 0; background-color: transparent; }
+.searchfolders .ui-searchinput input { background-color: transparent; }
 .pcode { font-family: Menlo,Consolas,monospace; background-color: #F0F0F0; font-size: 14px; border-radius: var(--radius); padding: 1px 2px; }
 
 .ui-box-title > nav button { border-left-color: #FFF; }
@@ -169,4 +172,13 @@ header .toolbar button { height: 26px; font-size: 12px; }
 
 @media(max-width: 768px) {
 	.nopadding-xs { padding: 0 !important; }
-}
\ No newline at end of file
+}
+
+.nav nav > a i { font-size: 15px; }
+.ui-box-title > nav button i { font-size: 14px; width: 14px; }
+.ui-input-checkbox span { line-height: 17px; }
+
+.ui-windows-item { box-shadow: 0 0 30px rgba(0,0,0,0.3); z-index: 20; }
+.jc-xs .ui-windows-body { border-left: 0; border-bottom: 0; border-right: 0; }
+.jc-xs .ui-windows-title { border-left: 0; border-top: 0; border-right: 0; }
+.ui-miniform-title > i { margin-top: 13px; }
\ No newline at end of file
diff --git a/ui/public/forms/infrastructure.html b/ui/public/forms/infrastructure.html
index f403b10f..5407de5a 100644
--- a/ui/public/forms/infrastructure.html
+++ b/ui/public/forms/infrastructure.html
@@ -1,4 +1,4 @@
-<ui-component name="miniform" path="common.form2" config="if:~PATH~;width:800;submit:?/submit;reload:?/reload;autofocus:1;icon:ti ti-folder;zindex:30" plugin="~PATH~" class="hidden">
+<ui-component name="miniform" path="common.form2" config="if:~PATH~;width:400;submit:?/submit;reload:?/reload;autofocus:1;icon:ti ti-sitemap;zindex:30" plugin="~PATH~" class="hidden">
 	<div class="padding">
 		<ui-bind path="?.id" config="template;show" class="block fs12 m">
 			<script type="text/html">
diff --git a/ui/public/forms/infrastructures.html b/ui/public/forms/infrastructures.html
index 7a95e5e0..98653058 100644
--- a/ui/public/forms/infrastructures.html
+++ b/ui/public/forms/infrastructures.html
@@ -16,7 +16,7 @@
 	}
 </style>
 
-<ui-component name="box" path="common.form" config="if:~PATH~;width:620;icon:ti ti-folders;title:@(Infrastructures);reload:?/reload;hide:?/close;" class="hidden ~PATH~" plugin="~PATH~">
+<ui-component name="box" path="common.form" config="if:~PATH~;width:620;icon:ti ti-sitemap;title:@(Infrastructures);reload:?/reload;hide:?/close;" class="hidden ~PATH~" plugin="~PATH~">
 	<nav>
 		<button class="exec" data-exec="?/add"><i class="ti ti-plus-circle green"></i>@(Add)</button>
 	</nav>
diff --git a/ui/public/forms/settings.html b/ui/public/forms/settings.html
index bfeadc22..10610c07 100644
--- a/ui/public/forms/settings.html
+++ b/ui/public/forms/settings.html
@@ -1,4 +1,4 @@
-<ui-component name="miniform" path="common.form" config="if:~PATH~;icon:cog;title:@(User settings);autofocus:true;reload:?/reload;scrollbar:1;submit:?/submit;width:500" class="hidden ~PATH~" plugin="~PATH~">
+<ui-component name="miniform" path="common.form" config="if:~PATH~;icon:cog;title:@(User settings);autofocus:true;reload:?/reload;scrollbar:1;submit:?/submit;width:400" class="hidden ~PATH~" plugin="~PATH~">
 	<div>
 		<div class="padding">
 			<div class="grid-2">
diff --git a/ui/public/forms/softwares.html b/ui/public/forms/softwares.html
index 96727f86..e2ee1633 100644
--- a/ui/public/forms/softwares.html
+++ b/ui/public/forms/softwares.html
@@ -17,7 +17,7 @@
 
 <ui-component name="box" path="common.form" config="if:~PATH~;width:1000;icon:ti ti-cube;title:@(Softwares);reload:?/reload;" class="hidden ~PATH~" plugin="~PATH~">
 	<nav>
-		<button class="exec" data-exec="?/settings"><i class="ti ti-config"></i>@(Settings)</button>
+		<button class="exec" data-exec="?/settings"><i class="ti ti-config"></i></button>
 		<button class="exec" data-exec="?/operations" data-bind="?__enabled:value&&(value.checked&&value.checked.length)__track:checked" disabled><i class="fa fa-check-circle"></i>@(Operate)</button>
 		<button class="exec" data-exec="?/add"><i class="ti ti-plus-circle green"></i>@(Add)</button>
 	</nav>
diff --git a/ui/public/forms/variable.html b/ui/public/forms/variable.html
index 601c069b..e5f2afbe 100644
--- a/ui/public/forms/variable.html
+++ b/ui/public/forms/variable.html
@@ -1,4 +1,4 @@
-<ui-component name="miniform" path="common.form2" config="if:~PATH~;width:800;submit:?/submit;reload:?/reload;autofocus:1;icon:ti ti-folder;zindex:30" plugin="~PATH~" class="hidden">
+<ui-component name="miniform" path="common.form2" config="if:~PATH~;width:600;submit:?/submit;reload:?/reload;autofocus:1;icon:ti ti-folder;zindex:30" plugin="~PATH~" class="hidden">
 	<div class="padding">
 		<ui-bind path="?.id" config="template;show" class="block fs12 m">
 			<script type="text/html">
diff --git a/ui/public/img/logo.png b/ui/public/img/logo.png
new file mode 100644
index 00000000..b0c74556
Binary files /dev/null and b/ui/public/img/logo.png differ
diff --git a/ui/public/pages/index.html b/ui/public/pages/index.html
index 413e512f..ce8753c0 100644
--- a/ui/public/pages/index.html
+++ b/ui/public/pages/index.html
@@ -1,24 +1,154 @@
 <style>
+
+	.CLASS .task { margin-bottom: 4px; background-color: #f8f8f8; border-radius: var(--radius); overflow: hidden; }
+	.CLASS .folder { width: 120px; padding-right: 10px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 21px; }
+	.CLASS .folder > div { border-radius: var(--radius); color: rgba(0,0,0,0.7); padding: 0 5px; background-color: #e8e8e8; }
+	.CLASS .closed .folder > div { color: rgba(100,100,100,0.7); opacity: 0.8; }
+	.CLASS .folder i { margin: 4px 2px 0 5px; }
+	.CLASS .folder a { color: #777; }
+	.CLASS .id { font-family: Menlo, Consolas, monospace; font-size: 11px; margin-right: 5px; color: #A0A0A0; }
+	.CLASS .status { margin: 0; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; color: #000; background-color: #fff; min-width: 20px; height: 20px; border-radius: var(--radius); display: flex; align-items: center; justify-content: center; position: relative; z-index: 10; border: 1px solid #e0e0e0; }
+	.CLASS .status:hover span { text-decoration: underline; }
+	.CLASS .user { position: relative; display: inline-block; }
+	.CLASS .user span { color: #FFF !important; background-color: #E0E0E0; width: 20px; height: 20px; line-height: 21px; font-size: 8px; font-weight: bold; text-align: center; border-radius: 100px; margin-right: 5px; position: relative; display: inline-block; }
+	.CLASS .user img { width: 20px; height: 20px; border-radius: 100px; margin-right: 5px; position: relative; display: inline-block; }
+	.CLASS .user span:last-child { margin-right: 0; }
+	.CLASS .user img:last-child { margin-right: 0; }
+	.CLASS .assigned b { background-color: rgba(255,199,92,0.2); padding: 2px 5px !important; border-radius: var(--radius); }
+	.CLASS .open .assigned b { background-color: rgb(115,182,255,0.28); }
+	.CLASS .user i { margin-right: 5px; }
+	.CLASS .public { font-size: 15px; }
+	.CLASS .date { line-height: 21px; width: 100px; float: right; color: #777; margin-right: 5px; text-align: right; }
+	.CLASS .worked { float: right; color: #777; text-align: right; border-right: 1px solid #E0E0E0; margin-right: 10px; padding-right: 10px; line-height: 21px; min-height: 21px; }
+	.CLASS .worked span { margin-right: 5px; color: #A0A0A0; }
+	.CLASS .sender { width: 120px; float: right; border-right: 1px solid #E0E0E0; margin-right: 10px; padding-right: 5px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; color: #777; line-height: 21px; }
+	.CLASS .unread { background-color: rgba(255,254,209,0.4); }
+	.CLASS .unreadicon { color: #CCCB41; animation: unreadnotification 1s infinite forwards; margin-right: 5px; font-size: 14px; }
+	.CLASS .foreign { background-color: rgba(255,254,97,0.1); }
+	.CLASS .expired .name b { color: #e73323; }
+	.CLASS .name { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; padding-left: 10px; display: flex; align-items: center; }
+	.CLASS .name b { padding: 2px 0; margin-right: 5px; }
+	.CLASS .name .ti-paperclip { color: #999; }
+	.CLASS .period { margin-right: 10px; color: rgba(0,0,0,0.6); border-radius: var(--radius); padding: 2px 4px 0; }
+	.CLASS .arrows { float: left; }
+	.CLASS .arrows .ti-minus { color: #777; }
+	.CLASS .priority.open .assigned b { background-color: rgba(232,72,63,0.15); }
+	.CLASS .open.priority b { color: #E8483F !important; }
+	.CLASS .open b { color: #222; }
+	.CLASS .open .status { color: #4285F4; }
+	.CLASS .open .folder { color: var(--color); }
+	.CLASS .pending b { font-weight: normal; }
+	.CLASS .sender a { color: #777; }
+	.CLASS .sender i { margin-right: 5px; }
+	.CLASS .selection { margin-top: 2px; width: 17px; height: 17px; }
+	.CLASS .postponed { color: #8C42F6; }
+	.CLASS .postponed .status { color: #8C42F6; }
+	.CLASS .postponed b { font-weight: normal; }
+	.CLASS .closed { color: #999; }
+	.CLASS .closed b { font-weight: normal; }
+	.CLASS .closed .id { color: #C0C0C0; }
+	.CLASS .closed .sender a { color: #A0A0A0; }
+	.CLASS .closed .folder { color: #A0A0A0; }
+	.CLASS .closed .status { color: #A0A0A0; }
+	.CLASS .closed .user span { color: #A0A0A0; font-weight: normal; filter: grayscale(1); }
+	.CLASS .closed .user img { filter: grayscale(1); }
+	.CLASS .listing { font-size: 12px; }
+	.CLASS .listing figure { border-radius: 0; }
+	.CLASS .listing section { /* padding: 7px 0 0; */ height: 34px; }
+	.CLASS .searchbox { max-width: 600px; text-align: left; position: relative; display: inline-block; width: 100%; margin: 12px 150px 0; }
+	.CLASS .searchbox .ui-searchinput { width: 100%; height: 34px; background-color: #F3F3F3; border: 0; margin-left: 30px; }
+	.CLASS .searchbox .ui-searchinput input { height: 33px; font-size: 14px; }
+	.CLASS .searchbox .ui-searchinput > span { width: 35px; line-height: 34px; font-size: 14px; }
+	.CLASS .searchbox .ui-searchinput > div { margin-left: 35px; }
+	.CLASS .separator { background-color: #fff !important; cursor: default; color: #888; padding: 25px 10px 15px; }
+	.CLASS .tickets .toolbar button { height: 34px; padding: 0 15px; font-size: 12px; width: 200px; }
+	.CLASS .counter { float: right; font-size: 11px; color: #A0A0A0; line-height: 18px; width: 18px; margin: 6px 0 0; text-align: center; }
+	.CLASS .counterunread { float: right; font-size: 11px; color: #FFF; background-color: #E73323; border-radius: 100px; line-height: 18px; width: 18px; margin: 6px 0 0; text-align: center; font-weight: bold; }
+	.CLASS .counterbookmark { float: right; font-size: 11px; color: #FFF; background-color: #EF9D4B; border-radius: 100px; line-height: 18px; width: 18px; margin: 6px 0 0; text-align: center; font-weight: bold; }
+	.CLASS .selected i { color: var(--color); }
+	.CLASS .isprivate { font-size: 10px; margin: 10px 0 0 0; float: right; color: orange !important; }
+	.CLASS .searchbox .calendar { float: left; font-size: 18px; margin: 4px 0 0; color: #999; }
+	.CLASS .searchbox .calendar:hover { color: #000; }
+	.CLASS .calendar.selected { animation: ticketscalendarbutton 1s infinite forwards; }
+	.CLASS .calendar.selected i { color: #EA706B; }
+	.CLASS .searchbox .ui-searchinput-is { background-color: #FFE8E8; }
+	.CLASS .comments { font-size: 16px; font-weight: normal; margin: 0; position: relative; display: inline-block; vertical-align: middle; color: rgba(0,0,0,0.4); border-left: 0; }
+	.CLASS .logo { float: left; margin: 20px 0 0 0; }
+	.CLASS .logo img { width: 120px; }
+	.CLASS .flag { padding: 3px; border-radius: var(--radius); line-height: 12px; font-size: 11px; margin: 0 5px 0 0; color: #FFF; vertical-align: middle; text-transform: uppercase; font-weight: bold; }
+	.CLASS .flag-asap { background-color: #E73323; }
+	.CLASS .flag-week { background-color: #CCCB41; }
+	.CLASS .flag-today { background-color: #EC8632; }
+	.CLASS .checkbox { width: 20px; height: 20px; border: 1px solid #E0E0E0; border-radius: var(--radius); background-color: #FFF; }
+
 	.CLASS .mobilemenu { display: none; z-index: 25; align-items: center; justify-content: center; width: 100%; height: 40px; position: absolute; left: 0; bottom: 0; background-color: #fff; border-top: 1px solid #e0e0e0; }
 	.CLASS .mobilemenu i { font-size: 20px; }
 	.CLASS main { position: relative; z-index: 1; }
 
-	@media(max-width: 768px)  {
-		.CLASS .mobilemenu { display: flex; height: 50px; background-color: #050505; }
+	.CLASS .fadeout { color: #A0A0A0; }
+	.CLASS .fadeout .period { background-color: rgba(0,0,0,0.06) !important; }
+	.CLASS .fadeout .date { color: #A0A0A0; }
+	.CLASS .fadeout .folder > div { background-color: rgba(0,0,0,0.06) !important; }
+	.CLASS .fadeout .date .red { color: #A0A0A0 !important; }
+	.CLASS .fadeout .status { color: #A0A0A0; }
+	.CLASS .fadeout .status > i { color: #A0A0A0 !important; }
+	.CLASS .subticket { position: relative; padding-left: 20px; }
+	.CLASS .subticket > section { margin: 0 !important; }
+	.CLASS .status-empty-BK { width: 120px; float: left; border-right: 1px solid #E0E0E0; margin-right: 10px; padding: 3px 0 0 5px; }
+	.CLASS .subticket .status { margin-left: 15px; }
+
+	.CLASS .subticket:before { position: absolute; background-color: transparent; width: 15px; height: 38px; display: block; content: ''; margin: -20px 0 0 0; border-left: 1px solid #D0D0D0; border-bottom: 1px solid #D0D0D0; border-radius: 0 0 0 var(--radius)}
+
+	.CLASS .listing figure > section { border-bottom: 0; display: flex; align-items: center; margin-right: 0; }
+	.CLASS .ticket .name { padding-left: 35px; }
+	.CLASS .ticket.subticket .name { padding-left: 10px; }
+	.CLASS .ticket .name:before { content: ''; width: 35px; height: 1px; background-color: #D0D0D0; position: absolute; left: 30px; }
+	.CLASS .ticket.subticket .name:before { display: none; }
+
+	@keyframes ticketscalendarbutton {
+		0% { transform: scale(1); }
+		50% { transform: scale(1.15); }
+		100% { transform: scale(1); }
+	}
+
+	@keyframes unreadnotification {
+		0% { transform: translate(0, 0); }
+		30% { transform: translate(-2px, 0); }
+		60% { transform: translate(1px, 0); }
+		100% { transform: translate(0, 0); }
+	}
+
+	@media(max-width: 1200px) {
+		.CLASS .searchbox { max-width: 400px; }
 	}
+
+	@media(max-width: 980px) {
+		.CLASS .searchbox { max-width: 300px; margin-left: 50px; margin-right: 100px; }
+		.CLASS .date { display: none; }
+		.CLASS .worked { display: none; }
+		.CLASS .status span { display: none; }
+		.CLASS .period { display: none; }
+	}
+
+	@media(max-width: 980px) {
+		.CLASS .mobilemenu { display: flex; }
+		.CLASS .folder, .CLASS .worked, .CLASS .date { display: none; }
+	}
+
 </style>
 
 <ui-plugin config="aclass:1">
 
+	<header>
+		<span class="mainmenu exec" data-exec="?/menu"><i class="ti ti-menu"></i></span>
+		<a href="#" target="_top" class="logo"><img src="/img/logo.png" alt="@(SimpleStack)" /></a>
+	</header>
+
 	<ui-component name="layout" config="parent:auto;width:200;margin:58">
 		<main style="border-left:0px solid #E0E0E0">
 			<div id="3d-graph"></div>
 		</main>
 	</ui-component>
-
-	<div class="mobilemenu exec" data-exec="?/mobilemenu">
-		<i class="ti ti-navicon"></i>
-	</div>
 </ui-plugin>
 
 <script>
@@ -72,11 +202,10 @@
 			var model = exports.model || {};
 		};
 
-		exports.mobilemenu = function(el) {
+		exports.menu = function(el) {
 			var opt = {};
 			opt.element = el;
-			opt.align = 'center';
-			opt.fixedwidth = true;
+			opt.align = 'left';
 			opt.items = [];
 
 			exports.tapi('search ERROR', function(response) {
@@ -86,10 +215,6 @@
 
 			opt.callback = function(selected) {
 				switch (selected.id) {
-					case 'graphs':
-						SET('tickets @reset', {uri: selected.form});
-						REDIRECT('/ @showloading @hideloading');
-						break;
 					case 'logout':
 						location.href = '/logout/';
 						break;
diff --git a/ui/schemas/spotlight.js b/ui/schemas/spotlight.js
index ef5cfe95..251281d3 100644
--- a/ui/schemas/spotlight.js
+++ b/ui/schemas/spotlight.js
@@ -1,64 +1,23 @@
 NEWACTION('Spotlight/search', {
     name: 'Search item',
-    query: 'q:String',
     async action($) {
-        const query = $.query?.q?.toSearch() ?? '';
-        const terms = query.trim().split(/\s+/);          // split on whitespace, ignore empty parts
-        const [primary, secondary] = terms;               // primary = first term, secondary = optional second term
-
-        const ORIGIN = [
-            { id: 'projects',   form: 'forminfrastructures', search: 'infrastructure', name: TRANSLATE($.user.language || '', '@(Infrastructures)'), icon: 'folders',      color: '#C5FC7C' },
-            { id: 'variables',  form: 'formvariables',       search: 'variables',      name: TRANSLATE($.user.language || '', '@(Variables)'),       icon: 'variables',    color: '#7BB2F9' },
-            { id: 'catalogs',   form: 'formcatalogs',        search: 'catalog',        name: TRANSLATE($.user.language || '', '@(Catalog)'),         icon: 'cubes',        color: '#EA706B' },
-            { id: 'softwares',  form: 'formsoftwares',       search: 'softwares',      name: TRANSLATE($.user.language || '', '@(Softwares)'),       icon: 'cube',         color: '#7BB2F9' },
-            { id: 'settings',   form: 'formsettings',        search: 'settings',       name: TRANSLATE($.user.language || '', '@(Your profile)'),    icon: 'settings',     color: '#EB73F8' },
-            { id: 'password',   form: 'formpassword',        search: 'user password',  name: TRANSLATE($.user.language || '', '@(Your password)'),   icon: 'key',          color: '#EB73F8' },
-            { id: 'logout',     form: 'logout',              search: 'logout',         name: TRANSLATE($.user.language || '', '@(Logout)'),          icon: 'power-off',    color: '#EA71B0' }
-        ];
-
-        // Admin‑only entry
+        let ORIGIN = [];
+        ORIGIN.push({ id: 'catalogs',   form: 'formcatalogs',        search: 'catalog',        name: TRANSLATE($.user.language || '', '@(Catalog)'),         icon: 'cubes',        color: '#EA706B' });
+        ORIGIN.push('-');
+        ORIGIN.push({ id: 'infrastructures',   form: 'forminfrastructures', search: 'infrastructure', name: TRANSLATE($.user.language || '', '@(Infrastructures)'), icon: 'sitemap',      color: '#C5FC7C' });
+        ORIGIN.push({ id: 'softwares',  form: 'formsoftwares',       search: 'softwares',      name: TRANSLATE($.user.language || '', '@(Softwares)'),       icon: 'cube',         color: '#7BB2F9' });
+        ORIGIN.push('-');
+        ORIGIN.push({ id: 'variables',  form: 'formvariables',       search: 'variables',      name: TRANSLATE($.user.language || '', '@(Variables)'),       icon: 'variables',    color: '#7BB2F9' });
+        ORIGIN.push('-');
         if ($.user.sa) {
             ORIGIN.push({ id: 'users', form: 'formusers', search: 'users', name: TRANSLATE($.user.language || '', '@(Users)'), icon: 'users', color: '#EB73F8' });
+            ORIGIN.push('-');
         }
+        ORIGIN.push({ id: 'settings',   form: 'formsettings',        search: 'settings',       name: TRANSLATE($.user.language || '', '@(Your profile)'),    icon: 'settings',     color: '#EB73F8' });
+        ORIGIN.push({ id: 'password',   form: 'formpassword',        search: 'user password',  name: TRANSLATE($.user.language || '', '@(Your password)'),   icon: 'key',          color: '#EB73F8' });
+        ORIGIN.push('-');
+        ORIGIN.push({ id: 'logout',     form: 'logout',              search: 'logout',         name: TRANSLATE($.user.language || '', '@(Logout)'),          icon: 'power-off',    color: '#EA71B0' });
 
-        const fetchSpotlight = async (module, params) => {
-            const result = await $.action(`${module}/spotlight`).params(params).promise($);
-            return result.filter(item => !secondary || item.search.includes(secondary));
-        };
-
-        const result = [];
-
-        // Map of command prefixes → async fetcher
-        const COMMANDS = [
-            { prefix: 'soft',   module: 'Softwares',   action: 'edit',    api: 'softwares_read' },
-            { prefix: 'redep',  module: 'Softwares',   alias: 'redeploy', action: 'main', api: 'softwares_execute' },
-            { prefix: 'back',   module: 'Softwares',   action: 'backup',  api: 'softwares_execute' },
-            { prefix: 'stop',   module: 'Softwares',   action: 'stop',    api: 'softwares_execute' },
-            { prefix: 'start',  module: 'Softwares',   action: 'start',   api: 'softwares_execute' },
-            { prefix: 'restore',module: 'Softwares',   action: 'restore', api: 'softwares_execute' },
-            { prefix: 'build',  module: 'Catalogs',    action: 'build',   api: 'catalog_read' }
-        ];
-
-        // Try to match a special command
-        const command = COMMANDS.find(c => primary?.includes(c.prefix));
-        if (command) {
-            const params = {
-                prefix: command.module.slice(0, -1), // e.g. "Software" from "Softwares"
-                action: command.action,
-                api: command.api,
-                ...(command.alias && { alias: command.alias })
-            };
-            const items = await fetchSpotlight(command.module, params);
-            result.push(...items);
-        } else {
-            // No special command – filter static entries
-            for (const item of ORIGIN) {
-                if (primary && !item.search.includes(primary)) continue;
-                result.push(item);
-                if (result.length >= 100) break;
-            }
-        }
-
-        $.callback(result);
+        $.callback(ORIGIN);
     }
 });
diff --git a/ui/views/index.html b/ui/views/index.html
index a1f4bbd0..69549b56 100644
--- a/ui/views/index.html
+++ b/ui/views/index.html
@@ -14,9 +14,8 @@
 	<link href="https://cdn.componentator.com/spa.min@19.css" rel="stylesheet" />
 	<script src="https://cdn.componentator.com/spa.min@19.js"></script>
 	<script src="/js/3d-force-graph.min@1.73.2.js"></script>
-	<link href="/css/ui.css" />
-	<link href="/css/default.css" />
-	@{import('meta', 'head', 'favicon.ico')}
+	@{if CONF.color}<style>:root{--color:@{CONF.color};}</style>@{fi}
+	@{import('meta', 'head', 'default.css + ui.css', 'favicon.ico')}
 </head>
 <body>
 	<ui-component name="autodarkmode"></ui-component>
@@ -27,7 +26,6 @@
 	<ui-component name="title" path="common.title"></ui-component>
 	<ui-component name="shortcuts"></ui-component>
 	<ui-component name="directory" config="placeholder:@(Search)"></ui-component>
-	<ui-component name="spotlight"></ui-component>
 	<ui-component name="LAZY timepicker"></ui-component>
 	<ui-component name="LAZY colorpicker"></ui-component>
 	<ui-component name="LAZY approve"></ui-component>
@@ -77,14 +75,6 @@
 
 			var model = exports.model;
 
-			exports.dropcheck = function(e) {
-				return model.form === 'formdetail';
-			};
-
-			exports.dropsend = function(files) {
-				EXEC(model.form + '/drop', files);
-			};
-
 			exports.version = function() {
 				exports.tapi('version', function(response) {
 					if (response.value !== DEF.versionhtml)
@@ -123,54 +113,6 @@
 
 		});
 
-		SETTER(true, 'shortcuts/register', 'F2', function(e){
-			var opt = {};
-
-			opt.delay = 400;
-			opt.recent = '';
-			opt.clear = true;
-			opt.cache = '';
-			opt.placeholder = 'action';
-			opt.search = function(value, next) {
-				DAPI('search/?q={0}'.format(encodeURIComponent(value)), function(response) {
-					next(response);
-				});
-			};
-			
-			opt.callback = function(selected) {
-				switch (selected.id) {
-					case 'logout':
-						location.href = '/logout/';
-						break;
-					case 'edit':
-						DAPI('{0}/{1} ERROR'.format(selected.api, selected.itemid), function(response) {
-							SET('{0} @reset @hideloading'.format(selected.form), response);
-							SET('common.form2', selected.form);
-						});
-						break;
-					case 'main':
-					case 'backup':
-					case 'stop':
-					case 'start':
-					case 'restore':
-						DAPI('{0}/{1} ERROR'.format(selected.api, selected.itemid), {action: selected.id }, function(response) {
-							SETTER('notify/success', '@({0} in progress...)'.format(selected.id));
-						});
-						break;
-					case 'build':
-						DAPI('{0}/{1} ERROR'.format(selected.api, selected.itemid), function(response) {
-							SETTER('notify/success', '@({0} in progress...)'.format(selected.id));
-						});
-						break;
-					default:
-						SET('common.form', selected.form);
-						break;
-				}
-			};
-	
-			SETTER('spotlight/show', opt);
-		});
-
 		ON('message', function(msg) {
 			switch (msg.TYPE) {
 				case 'setter':