diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 60a692ab5..fe1f1c2d6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -14,11 +14,11 @@
 				"@fontsource/lexend": "^5.0.21",
 				"@fontsource/public-sans": "^5.0.18",
 				"@popperjs/core": "^2.11.8",
-				"@shikijs/markdown-it": "^1.14.1",
+				"@shikijs/markdown-it": "^1.16.1",
 				"@vueuse/components": "^11.0.3",
 				"@vueuse/core": "^11.0.3",
-				"apexcharts": "^3.52.0",
-				"axios": "^1.7.5",
+				"apexcharts": "^3.53.0",
+				"axios": "^1.7.7",
 				"bytes": "^3.1.2",
 				"colord": "^2.9.3",
 				"crypto-js": "^4.2.0",
@@ -36,7 +36,7 @@
 				"pinia": "^2.2.2",
 				"pinia-plugin-persistedstate": "^3.2.3",
 				"secure-ls": "^2.0.0",
-				"shiki": "^1.14.1",
+				"shiki": "^1.16.1",
 				"validator": "^13.12.0",
 				"vue": "^3.4.38",
 				"vue-advanced-cropper": "^2.8.9",
@@ -44,8 +44,8 @@
 				"vue-i18n": "^9.14.0",
 				"vue-router": "^4.4.3",
 				"vue-sjv": "^0.0.6",
-				"vue3-apexcharts": "^1.5.3",
-				"vue3-marquee": "^4.2.1",
+				"vue3-apexcharts": "^1.6.0",
+				"vue3-marquee": "^4.2.2",
 				"vuedraggable": "^4.1.0"
 			},
 			"devDependencies": {
@@ -58,16 +58,16 @@
 				"@types/inquirer": "^9.0.7",
 				"@types/jsdom": "^21.1.7",
 				"@types/lodash": "^4.17.7",
-				"@types/node": "^22.5.1",
+				"@types/node": "^22.5.2",
 				"@types/validator": "^13.12.1",
-				"@vitejs/plugin-vue": "^5.1.2",
+				"@vitejs/plugin-vue": "^5.1.3",
 				"@vitejs/plugin-vue-jsx": "^4.0.1",
 				"@vue/eslint-config-prettier": "^9.0.0",
 				"@vue/eslint-config-typescript": "^13.0.0",
 				"@vue/test-utils": "^2.4.6",
 				"@vue/tsconfig": "^0.5.1",
 				"autoprefixer": "^10.4.20",
-				"cypress": "^13.14.0",
+				"cypress": "^13.14.1",
 				"eslint": "^9.9.1",
 				"eslint-plugin-cypress": "^3.5.0",
 				"eslint-plugin-vue": "^9.27.0",
@@ -78,7 +78,7 @@
 				"json5": "^2.2.3",
 				"npm-run-all2": "^6.2.2",
 				"picocolors": "^1.0.1",
-				"postcss": "^8.4.41",
+				"postcss": "^8.4.43",
 				"prettier": "^3.3.3",
 				"sass": "^1.77.8",
 				"start-server-and-test": "^2.0.5",
@@ -93,13 +93,13 @@
 				"vite-plugin-vue-devtools": "^7.3.9",
 				"vite-svg-loader": "^5.1.0",
 				"vitest": "^2.0.5",
-				"vue-tsc": "^2.1.2"
+				"vue-tsc": "^2.1.5"
 			},
 			"engines": {
 				"node": ">=18.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-linux-x64-gnu": "^4.21.1"
+				"@rollup/rollup-linux-x64-gnu": "^4.21.2"
 			}
 		},
 		"node_modules/@ajoelp/json-to-formdata": {
@@ -676,7 +676,6 @@
 		},
 		"node_modules/@clack/prompts/node_modules/is-unicode-supported": {
 			"version": "1.3.0",
-			"extraneous": true,
 			"inBundle": true,
 			"license": "MIT",
 			"engines": {
@@ -1945,9 +1944,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.21.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.1.tgz",
-			"integrity": "sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==",
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+			"integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
 			"cpu": [
 				"x64"
 			],
@@ -2009,31 +2008,37 @@
 			]
 		},
 		"node_modules/@shikijs/core": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.14.1.tgz",
-			"integrity": "sha512-KyHIIpKNaT20FtFPFjCQB5WVSTpLR/n+jQXhWHWVUMm9MaOaG9BGOG0MSyt7yA4+Lm+4c9rTc03tt3nYzeYSfw==",
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.16.1.tgz",
+			"integrity": "sha512-aI0hBtw+a6KsJp2jcD4YuQqKpeCbURMZbhHVozDknJpm+KJqeMRkEnfBC8BaKE/5XC+uofPgCLsa/TkTk0Ba0w==",
 			"dependencies": {
+				"@shikijs/vscode-textmate": "^9.2.0",
 				"@types/hast": "^3.0.4"
 			}
 		},
 		"node_modules/@shikijs/markdown-it": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@shikijs/markdown-it/-/markdown-it-1.14.1.tgz",
-			"integrity": "sha512-bb7IHIKLqKMf8ufjdRmsw2wfvX6k9e1DJCfqWEj6RMP59aFohX3emhXIoY8M8uxVfwMTi5ik9QAXGBg6DDnG+A==",
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/@shikijs/markdown-it/-/markdown-it-1.16.1.tgz",
+			"integrity": "sha512-vVEm/htIykOHdUn4OqMFKCBpFWUx+jkGzb0mCWE37nEsjzuE7qY4dC2s9mDtsAO+CnGY5dQNBc3yzgj7poDjeg==",
 			"dependencies": {
-				"@shikijs/transformers": "1.14.1",
+				"@shikijs/transformers": "1.16.1",
 				"markdown-it": "^14.1.0",
-				"shiki": "1.14.1"
+				"shiki": "1.16.1"
 			}
 		},
 		"node_modules/@shikijs/transformers": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.14.1.tgz",
-			"integrity": "sha512-JJqL8QBVCJh3L61jqqEXgFq1cTycwjcGj7aSmqOEsbxnETM9hRlaB74QuXvY/fVJNjbNt8nvWo0VwAXKvMSLRg==",
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.16.1.tgz",
+			"integrity": "sha512-mfbe4YMov+1eyIBU3F6BtaPmLgDkRQaVse8xsBlKTVAcNF3cbZMRCyUz2N6gJOMKLJiv9T5gapBPbRxrDMuoxA==",
 			"dependencies": {
-				"shiki": "1.14.1"
+				"shiki": "1.16.1"
 			}
 		},
+		"node_modules/@shikijs/vscode-textmate": {
+			"version": "9.2.0",
+			"resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.2.0.tgz",
+			"integrity": "sha512-5FinaOp6Vdh/dl4/yaOTh0ZeKch+rYS8DUb38V3GMKYVkdqzxw53lViRKUYkVILRiVQT7dcPC7VvAKOR73zVtQ=="
+		},
 		"node_modules/@sideway/address": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -2160,9 +2165,9 @@
 			}
 		},
 		"node_modules/@types/node": {
-			"version": "22.5.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
-			"integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
+			"version": "22.5.2",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz",
+			"integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==",
 			"dev": true,
 			"dependencies": {
 				"undici-types": "~6.19.2"
@@ -2779,9 +2784,9 @@
 			}
 		},
 		"node_modules/@vitejs/plugin-vue": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.2.tgz",
-			"integrity": "sha512-nY9IwH12qeiJqumTCLJLE7IiNx7HZ39cbHaysEUd+Myvbz9KAqd2yq+U01Kab1R/H1BmiyM2ShTYlNH32Fzo3A==",
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.3.tgz",
+			"integrity": "sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==",
 			"dev": true,
 			"engines": {
 				"node": "^18.0.0 || >=20.0.0"
@@ -3139,9 +3144,10 @@
 			}
 		},
 		"node_modules/@vue/language-core": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.2.tgz",
-			"integrity": "sha512-tt2J7C+l0J/T5PaLhJ0jvCCi0JNwu3e8azWTYxW3jmAW5B/dac0g5UxmI7l59CQgCGFotqUqI3tXjfZgoWNtog==",
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.5.tgz",
+			"integrity": "sha512-YwF5+2v+rnue2/17wP84tnZgaB2hUM4C1U+115vVGrDAPGhBf7YG0nPv1SO0yUeEpYMYtED4ClamkXAwpoz2Yw==",
+			"deprecated": "use 2.1.4 instead",
 			"dev": true,
 			"dependencies": {
 				"@volar/language-core": "~2.4.1",
@@ -3503,9 +3509,9 @@
 			}
 		},
 		"node_modules/apexcharts": {
-			"version": "3.52.0",
-			"resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.52.0.tgz",
-			"integrity": "sha512-7dg0ADKs8AA89iYMZMe2sFDG0XK5PfqllKV9N+i3hKHm3vEtdhwz8AlXGm+/b0nJ6jKiaXsqci5LfVxNhtB+dA==",
+			"version": "3.53.0",
+			"resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.53.0.tgz",
+			"integrity": "sha512-QESZHZY3w9LPQ64PGh1gEdfjYjJ5Jp+Dfy0D/CLjsLOPTpXzdxwlNMqRj+vPbTcP0nAHgjWv1maDqcEq6u5olw==",
 			"dependencies": {
 				"@yr/monotone-cubic-spline": "^1.0.3",
 				"svg.draggable.js": "^2.2.2",
@@ -3669,9 +3675,9 @@
 			"dev": true
 		},
 		"node_modules/axios": {
-			"version": "1.7.5",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-			"integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+			"version": "1.7.7",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+			"integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
 			"dependencies": {
 				"follow-redirects": "^1.15.6",
 				"form-data": "^4.0.0",
@@ -4553,9 +4559,9 @@
 			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
 		},
 		"node_modules/cypress": {
-			"version": "13.14.0",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.0.tgz",
-			"integrity": "sha512-r0+nhd033x883YL6068futewUsl02Q7rWiinyAAIBDW/OOTn+UMILWgNuCiY3vtJjd53efOqq5R9dctQk/rKiw==",
+			"version": "13.14.1",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.1.tgz",
+			"integrity": "sha512-Wo+byPmjps66hACEH5udhXINEiN3qS3jWNGRzJOjrRJF3D0+YrcP2LVB1T7oYaVQM/S+eanqEvBWYc8cf7Vcbg==",
 			"dev": true,
 			"hasInstallScript": true,
 			"dependencies": {
@@ -8883,9 +8889,9 @@
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.41",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-			"integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+			"version": "8.4.43",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
+			"integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -9807,11 +9813,12 @@
 			}
 		},
 		"node_modules/shiki": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/shiki/-/shiki-1.14.1.tgz",
-			"integrity": "sha512-FujAN40NEejeXdzPt+3sZ3F2dx1U24BY2XTY01+MG8mbxCiA2XukXdcbyMyLAHJ/1AUUnQd1tZlvIjefWWEJeA==",
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/shiki/-/shiki-1.16.1.tgz",
+			"integrity": "sha512-tCJIMaxDVB1mEIJ5TvfZU7kCPB5eo9fli5+21Olc/bmyv+w8kye3JOp+LZRmGkAyT71hrkefQhTiY+o9mBikRQ==",
 			"dependencies": {
-				"@shikijs/core": "1.14.1",
+				"@shikijs/core": "1.16.1",
+				"@shikijs/vscode-textmate": "^9.2.0",
 				"@types/hast": "^3.0.4"
 			}
 		},
@@ -11894,13 +11901,14 @@
 			}
 		},
 		"node_modules/vue-tsc": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.2.tgz",
-			"integrity": "sha512-PH1BDxWT3eaPhl73elyZj6DV0nR3K4IFoUM1sGzMXXQneovVUwHQytdSyAHiED5MtEINGSHpL/Hs9ch+c/tDTw==",
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.5.tgz",
+			"integrity": "sha512-r4uljp8HQkGXPnNHR0qKkoE/g5OYYycr9Kfblxg0pLaPAxVr7SU/wmYhD7Y/ETApDl4+ZwvgFgn3RTOE7Xgy0Q==",
+			"deprecated": "use 2.1.4 instead",
 			"dev": true,
 			"dependencies": {
 				"@volar/typescript": "~2.4.1",
-				"@vue/language-core": "2.1.2",
+				"@vue/language-core": "2.1.5",
 				"semver": "^7.5.4"
 			},
 			"bin": {
@@ -11911,18 +11919,18 @@
 			}
 		},
 		"node_modules/vue3-apexcharts": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/vue3-apexcharts/-/vue3-apexcharts-1.5.3.tgz",
-			"integrity": "sha512-yaHTPoj0iVKAtEVg8wEwIwwvf0VG+lPYNufCf3txRzYQOqdKPoZaZ9P3Dj3X+2A1XY9O1kcTk9HVqvLo+rppvQ==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/vue3-apexcharts/-/vue3-apexcharts-1.6.0.tgz",
+			"integrity": "sha512-gemKFXpw4TuVcllwyKJGYjTwiJQxxCUwbXsiiEEZjs0zc9jvOHvreN8frXz7QbnYqMqOHF9D1TBqwENvoPNjLw==",
 			"peerDependencies": {
 				"apexcharts": "> 3.0.0",
 				"vue": "> 3.0.0"
 			}
 		},
 		"node_modules/vue3-marquee": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/vue3-marquee/-/vue3-marquee-4.2.1.tgz",
-			"integrity": "sha512-3nJs2ZNnEre9qZapeRcJ8WUrhE7Z8dm9pH7jR5TYBLmGre46w6vLCht6kcNruOO/c50wuYCx73wQCaXJ0Y/Kvg==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/vue3-marquee/-/vue3-marquee-4.2.2.tgz",
+			"integrity": "sha512-FeFvGUVInKfFilXFcnl8sDRBJBZCZSNLlQDquJErB9db6W2xICRVqbRV/jtdzsEP0rftarLQhx9MeEAU0+TPuQ==",
 			"engines": {
 				"node": ">=12"
 			},
diff --git a/frontend/package.json b/frontend/package.json
index 567231de9..2ce913542 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -36,11 +36,11 @@
 		"@fontsource/lexend": "^5.0.21",
 		"@fontsource/public-sans": "^5.0.18",
 		"@popperjs/core": "^2.11.8",
-		"@shikijs/markdown-it": "^1.14.1",
+		"@shikijs/markdown-it": "^1.16.1",
 		"@vueuse/components": "^11.0.3",
 		"@vueuse/core": "^11.0.3",
-		"apexcharts": "^3.52.0",
-		"axios": "^1.7.5",
+		"apexcharts": "^3.53.0",
+		"axios": "^1.7.7",
 		"bytes": "^3.1.2",
 		"colord": "^2.9.3",
 		"crypto-js": "^4.2.0",
@@ -58,7 +58,7 @@
 		"pinia": "^2.2.2",
 		"pinia-plugin-persistedstate": "^3.2.3",
 		"secure-ls": "^2.0.0",
-		"shiki": "^1.14.1",
+		"shiki": "^1.16.1",
 		"validator": "^13.12.0",
 		"vue": "^3.4.38",
 		"vue-advanced-cropper": "^2.8.9",
@@ -66,8 +66,8 @@
 		"vue-i18n": "^9.14.0",
 		"vue-router": "^4.4.3",
 		"vue-sjv": "^0.0.6",
-		"vue3-apexcharts": "^1.5.3",
-		"vue3-marquee": "^4.2.1",
+		"vue3-apexcharts": "^1.6.0",
+		"vue3-marquee": "^4.2.2",
 		"vuedraggable": "^4.1.0"
 	},
 	"devDependencies": {
@@ -80,16 +80,16 @@
 		"@types/inquirer": "^9.0.7",
 		"@types/jsdom": "^21.1.7",
 		"@types/lodash": "^4.17.7",
-		"@types/node": "^22.5.1",
+		"@types/node": "^22.5.2",
 		"@types/validator": "^13.12.1",
-		"@vitejs/plugin-vue": "^5.1.2",
+		"@vitejs/plugin-vue": "^5.1.3",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@vue/eslint-config-prettier": "^9.0.0",
 		"@vue/eslint-config-typescript": "^13.0.0",
 		"@vue/test-utils": "^2.4.6",
 		"@vue/tsconfig": "^0.5.1",
 		"autoprefixer": "^10.4.20",
-		"cypress": "^13.14.0",
+		"cypress": "^13.14.1",
 		"eslint": "^9.9.1",
 		"eslint-plugin-cypress": "^3.5.0",
 		"eslint-plugin-vue": "^9.27.0",
@@ -100,7 +100,7 @@
 		"json5": "^2.2.3",
 		"npm-run-all2": "^6.2.2",
 		"picocolors": "^1.0.1",
-		"postcss": "^8.4.41",
+		"postcss": "^8.4.43",
 		"prettier": "^3.3.3",
 		"sass": "^1.77.8",
 		"start-server-and-test": "^2.0.5",
@@ -115,10 +115,10 @@
 		"vite-plugin-vue-devtools": "^7.3.9",
 		"vite-svg-loader": "^5.1.0",
 		"vitest": "^2.0.5",
-		"vue-tsc": "^2.1.2"
+		"vue-tsc": "^2.1.5"
 	},
 	"optionalDependencies": {
-		"@rollup/rollup-linux-x64-gnu": "^4.21.1"
+		"@rollup/rollup-linux-x64-gnu": "^4.21.2"
 	},
 	"overrides": {
 		"@vue/eslint-config-typescript": {
diff --git a/frontend/src/api/endpoints/soc.ts b/frontend/src/api/endpoints/soc.ts
index f138e9484..4325feaea 100644
--- a/frontend/src/api/endpoints/soc.ts
+++ b/frontend/src/api/endpoints/soc.ts
@@ -138,7 +138,7 @@ export default {
 							time_unit: payload?.unit || "days"
 						}
 						/*eslint no-mixed-spaces-and-tabs: "off"*/
-				  }
+					}
 				: undefined
 		)
 	},
diff --git a/frontend/src/components/agents/agentFlow/AgentFlowItem.vue b/frontend/src/components/agents/agentFlow/AgentFlowItem.vue
index 1f87a0b3c..fd4739a1e 100644
--- a/frontend/src/components/agents/agentFlow/AgentFlowItem.vue
+++ b/frontend/src/components/agents/agentFlow/AgentFlowItem.vue
@@ -74,7 +74,7 @@
 					<div class="grid gap-2 grid-auto-fit-200 p-7 pt-4" v-if="properties">
 						<KVCard v-for="(value, key) of properties" :key="key">
 							<template #key>{{ key }}</template>
-							<template #value>{{ value === "" ? "-" : value ?? "-" }}</template>
+							<template #value>{{ value === "" ? "-" : (value ?? "-") }}</template>
 						</KVCard>
 					</div>
 				</n-tab-pane>
diff --git a/frontend/src/components/agents/agentFlow/AgentFlowQueryStat.vue b/frontend/src/components/agents/agentFlow/AgentFlowQueryStat.vue
index 0fcfc6697..0586f211c 100644
--- a/frontend/src/components/agents/agentFlow/AgentFlowQueryStat.vue
+++ b/frontend/src/components/agents/agentFlow/AgentFlowQueryStat.vue
@@ -64,7 +64,7 @@
 					<div class="grid gap-2 grid-auto-fit-200 p-7 pt-4" v-if="properties">
 						<KVCard v-for="(value, key) of properties" :key="key">
 							<template #key>{{ key }}</template>
-							<template #value>{{ value === "" ? "-" : value ?? "-" }}</template>
+							<template #value>{{ value === "" ? "-" : (value ?? "-") }}</template>
 						</KVCard>
 					</div>
 				</n-tab-pane>
diff --git a/frontend/src/components/agents/sca/ScaResultItemDetails.vue b/frontend/src/components/agents/sca/ScaResultItemDetails.vue
index 1a232dc15..3219e77b4 100644
--- a/frontend/src/components/agents/sca/ScaResultItemDetails.vue
+++ b/frontend/src/components/agents/sca/ScaResultItemDetails.vue
@@ -11,8 +11,8 @@
 									data.result === 'failed'
 										? 'text-error-color'
 										: data.result === 'not applicable'
-										? 'text-warning-color'
-										: 'text-success-color'
+											? 'text-warning-color'
+											: 'text-success-color'
 								"
 							>
 								{{ data.result }}
diff --git a/frontend/src/components/auth/AuthForm.vue b/frontend/src/components/auth/AuthForm.vue
index d903e0a76..b158509a2 100644
--- a/frontend/src/components/auth/AuthForm.vue
+++ b/frontend/src/components/auth/AuthForm.vue
@@ -52,8 +52,8 @@ const title = computed<string>(() =>
 	typeRef.value === "signin"
 		? "SOCFortress CoPilot"
 		: typeRef.value === "signup"
-		? "SOCFortress CoPilot"
-		: "Forgot Password"
+			? "SOCFortress CoPilot"
+			: "Forgot Password"
 )
 
 function gotoSignIn() {
diff --git a/frontend/src/components/cards/CardActions.vue b/frontend/src/components/cards/CardActions.vue
index 365f1298e..24382144d 100644
--- a/frontend/src/components/cards/CardActions.vue
+++ b/frontend/src/components/cards/CardActions.vue
@@ -71,7 +71,7 @@ const menuOptions = computed(() =>
 					key: "reload",
 					icon: renderIcon(ReloadIcon)
 				}
-		  ]
+			]
 		: [
 				{
 					label: "Collapse",
@@ -83,7 +83,7 @@ const menuOptions = computed(() =>
 					key: "reload",
 					icon: renderIcon(ReloadIcon)
 				}
-		  ]
+			]
 )
 
 function menuSelect(key: string) {
diff --git a/frontend/src/components/common/CodeSource.vue b/frontend/src/components/common/CodeSource.vue
index a1930ef3c..879a49d09 100644
--- a/frontend/src/components/common/CodeSource.vue
+++ b/frontend/src/components/common/CodeSource.vue
@@ -2,7 +2,7 @@
 	<div class="flex flex-col gap-2">
 		<n-card content-class="bg-secondary-color !p-0" class="overflow-hidden" v-if="!showSource">
 			<div class="scrollbar-styled overflow-hidden code-bg-transparent" v-shiki="{ lang, decode }">
-				<pre v-html="code"></pre>
+				<pre v-html="source"></pre>
 			</div>
 		</n-card>
 
@@ -37,5 +37,5 @@ const { code, lang } = defineProps<{
 }>()
 
 const showSource = ref(false)
-const source = computed(() => code.toString())
+const source = computed(() => JSON.stringify(code, null, "\t"))
 </script>
diff --git a/frontend/src/components/incidentManagement/alerts/AlertItem.vue b/frontend/src/components/incidentManagement/alerts/AlertItem.vue
index 66ca3ddbd..e9d4c1da3 100644
--- a/frontend/src/components/incidentManagement/alerts/AlertItem.vue
+++ b/frontend/src/components/incidentManagement/alerts/AlertItem.vue
@@ -54,8 +54,8 @@
 								alert.status === 'OPEN'
 									? 'danger'
 									: alert.status === 'IN_PROGRESS'
-									? 'warning'
-									: 'success'
+										? 'warning'
+										: 'success'
 							"
 						>
 							<template #iconLeft>
@@ -96,8 +96,8 @@
 									alert.status === 'OPEN'
 										? 'danger'
 										: alert.status === 'IN_PROGRESS'
-										? 'warning'
-										: 'success'
+											? 'warning'
+											: 'success'
 								"
 							>
 								<template #iconLeft>
diff --git a/frontend/src/components/incidentManagement/cases/CaseOverview.vue b/frontend/src/components/incidentManagement/cases/CaseOverview.vue
index 61e8f49ae..07060a278 100644
--- a/frontend/src/components/incidentManagement/cases/CaseOverview.vue
+++ b/frontend/src/components/incidentManagement/cases/CaseOverview.vue
@@ -8,10 +8,10 @@
 							caseData.case_status === 'OPEN'
 								? 'danger'
 								: caseData.case_status === 'IN_PROGRESS'
-								? 'warning'
-								: caseData.case_status === 'CLOSED'
-								? 'success'
-								: undefined
+									? 'warning'
+									: caseData.case_status === 'CLOSED'
+										? 'success'
+										: undefined
 						"
 						size="lg"
 						class="grow w-full"
diff --git a/frontend/src/components/incidentManagement/common/StatusIcon.vue b/frontend/src/components/incidentManagement/common/StatusIcon.vue
index e1eb5d183..e8f4235e9 100644
--- a/frontend/src/components/incidentManagement/common/StatusIcon.vue
+++ b/frontend/src/components/incidentManagement/common/StatusIcon.vue
@@ -4,10 +4,10 @@
 			status === 'OPEN'
 				? WarningIcon
 				: status === 'IN_PROGRESS'
-				? ProgressIcon
-				: status === 'CLOSED'
-				? CheckIcon
-				: UnknownIcon
+					? ProgressIcon
+					: status === 'CLOSED'
+						? CheckIcon
+						: UnknownIcon
 		"
 		:size="size || 16"
 	/>
diff --git a/frontend/src/components/sigma/QueriesActions.vue b/frontend/src/components/sigma/QueriesActions.vue
new file mode 100644
index 000000000..0cf62b7b7
--- /dev/null
+++ b/frontend/src/components/sigma/QueriesActions.vue
@@ -0,0 +1,72 @@
+<template>
+	<div class="sigma-queries-actions flex flex-wrap gap-2">
+		<QueryActiveAllForm v-slot="{ loading, togglePopup }" @updated="emitUpdate()">
+			<n-button size="small" type="primary" secondary strong :loading @click.stop="togglePopup()">
+				<template #icon>
+					<Icon :name="EditIcon" />
+				</template>
+				Update queries status
+			</n-button>
+		</QueryActiveAllForm>
+
+		<QueryUploadFile v-slot="{ loading, togglePopup }" @updated="emitUpdate()">
+			<n-button size="small" type="success" secondary strong :loading @click.stop="togglePopup()">
+				<template #icon>
+					<Icon :name="UploadFileIcon" />
+				</template>
+				Upload queries from FIle
+			</n-button>
+		</QueryUploadFile>
+
+		<QueryUploadDB v-slot="{ loading, togglePopup }" @updated="emitUpdate()">
+			<n-button size="small" type="success" secondary strong :loading @click.stop="togglePopup()">
+				<template #icon>
+					<Icon :name="UploadIcon" />
+				</template>
+				Upload queries to DB
+			</n-button>
+		</QueryUploadDB>
+
+		<QueryDownloadAll v-slot="{ loading, togglePopup }" @updated="emitUpdate()">
+			<n-button size="small" type="success" secondary strong :loading @click.stop="togglePopup()">
+				<template #icon>
+					<Icon :name="DownloadIcon" />
+				</template>
+				Download queries
+			</n-button>
+		</QueryDownloadAll>
+
+		<QueryDeleteAll v-slot="{ loading, togglePopup }" @updated="emitUpdate()">
+			<n-button size="small" type="error" secondary strong :loading @click.stop="togglePopup()">
+				<template #icon>
+					<Icon :name="DeleteIcon" />
+				</template>
+				Delete all queries
+			</n-button>
+		</QueryDeleteAll>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { NButton } from "naive-ui"
+import QueryActiveAllForm from "./actionsProviders/QueryActiveAllForm.vue"
+import QueryDeleteAll from "./actionsProviders/QueryDeleteAll.vue"
+import QueryDownloadAll from "./actionsProviders/QueryDownloadAll.vue"
+import QueryUploadDB from "./actionsProviders/QueryUploadDB.vue"
+import QueryUploadFile from "./actionsProviders/QueryUploadFile.vue"
+import Icon from "@/components/common/Icon.vue"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const EditIcon = "uil:edit-alt"
+const DeleteIcon = "ph:trash"
+const DownloadIcon = "carbon:cloud-download"
+const UploadIcon = "carbon:cloud-upload"
+const UploadFileIcon = "carbon:upload"
+
+function emitUpdate() {
+	emit("updated")
+}
+</script>
diff --git a/frontend/src/components/sigma/QueriesList.vue b/frontend/src/components/sigma/QueriesList.vue
index 8dadf9ba2..0375640b3 100644
--- a/frontend/src/components/sigma/QueriesList.vue
+++ b/frontend/src/components/sigma/QueriesList.vue
@@ -30,7 +30,7 @@
 					</div>
 				</n-popover>
 
-				<n-button size="small" type="primary" secondary strong v-if="queriesList.length">
+				<n-button size="small" type="primary" secondary strong @click="showActionsView = !showActionsView">
 					<div class="flex items-center gap-2">
 						<Icon :name="ToolsIcon" :size="16"></Icon>
 						<span class="hidden xs:block">Actions</span>
@@ -71,13 +71,27 @@
 							class="!w-56"
 						/>
 					</div>
-					<div class="px-3 flex justify-end gap-2">
-						<n-button size="small" @click="showFilters = false" secondary>Close</n-button>
-						<n-button size="small" @click="getData()" type="primary" secondary>Submit</n-button>
+					<div class="px-3 flex justify-between gap-2">
+						<div class="flex justify-start gap-2">
+							<n-button size="small" @click="showFilters = false" quaternary>Close</n-button>
+						</div>
+						<div class="flex justify-end gap-2">
+							<n-button size="small" @click="resetFilters()" secondary>Reset</n-button>
+							<n-button size="small" @click="getData()" type="primary" secondary :loading>
+								Submit
+							</n-button>
+						</div>
 					</div>
 				</div>
 			</n-popover>
 		</div>
+
+		<div class="actions-box" :class="{ open: showActionsView }">
+			<n-card size="small" content-class="bg-secondary-color" class="overflow-hidden" :bordered="false">
+				<QueriesActions @updated="getData()" />
+			</n-card>
+		</div>
+
 		<n-spin :show="loading">
 			<div class="list flex flex-col gap-2 my-3">
 				<template v-if="queriesList.length">
@@ -95,6 +109,7 @@
 				</template>
 			</div>
 		</n-spin>
+
 		<div class="footer flex justify-end">
 			<n-pagination
 				v-model:page="currentPage"
@@ -109,23 +124,28 @@
 
 <script setup lang="ts">
 import { ref, onBeforeMount, computed, watch } from "vue"
-import { useMessage, NSpin, NPopover, NButton, NEmpty, NSelect, NPagination, NBadge } from "naive-ui"
+import { NCard, NSpin, NPopover, NButton, NEmpty, NSelect, NPagination, NBadge, useMessage } from "naive-ui"
 import Api from "@/api"
 import _cloneDeep from "lodash/cloneDeep"
 import _orderBy from "lodash/orderBy"
 import Icon from "@/components/common/Icon.vue"
-import { useResizeObserver } from "@vueuse/core"
+import { useResizeObserver, useStorage } from "@vueuse/core"
 import QueryItem from "./QueryItem.vue"
+import QueriesActions from "./QueriesActions.vue"
 import type { SigmaQuery } from "@/types/sigma.d"
 
 interface QueriesFilter {
 	active: "active" | "inactive"
 }
 
-// const dialog = useDialog()
+const FilterIcon = "carbon:filter-edit"
+const InfoIcon = "carbon:information"
+const ToolsIcon = "carbon:tools"
+
 const message = useMessage()
 const loading = ref(false)
 const showFilters = ref(false)
+const showActionsView = useStorage<boolean>("sigma-queries-list-actions-view-state", false, localStorage)
 const queriesList = ref<SigmaQuery[]>([])
 
 const pageSize = ref(25)
@@ -145,10 +165,6 @@ const itemsPaginated = computed(() => {
 	return list.slice(from, to)
 })
 
-const FilterIcon = "carbon:filter-edit"
-const InfoIcon = "carbon:information"
-const ToolsIcon = "carbon:tools"
-
 const total = computed<number>(() => {
 	return queriesList.value.length || 0
 })
@@ -186,7 +202,13 @@ function updateQueryItem(query: SigmaQuery) {
 
 function deleteQueryItem(query: SigmaQuery) {
 	const index = queriesList.value.findIndex(o => o.id === query.id)
-	queriesList.value = queriesList.value.splice(index, 1)
+	queriesList.value.splice(index, 1)
+}
+
+function resetFilters() {
+	filters.value.active = undefined
+	showFilters.value = false
+	getData()
 }
 
 function getData() {
@@ -214,43 +236,7 @@ function getData() {
 			loading.value = false
 		})
 }
-/*
-function handlePurge() {
-	dialog.warning({
-		title: "Confirm",
-		content: "This will remove ALL cases, are you sure you want to proceed?",
-		positiveText: "Yes I'm sure",
-		negativeText: "Cancel",
-		onPositiveClick: () => {
-			purge()
-		},
-		onNegativeClick: () => {
-			message.info("Purge canceled")
-		}
-	})
-}
-
-function purge() {
-	loadingPurge.value = true
 
-	Api.soc
-		.purgeAllCases()
-		.then(res => {
-			if (res.data.success) {
-				getData()
-				message.success(res.data?.message || "SOC Cases purged successfully")
-			} else {
-				message.warning(res.data?.message || "An error occurred. Please try again later.")
-			}
-		})
-		.catch(err => {
-			message.error(err.response?.data?.message || "An error occurred. Please try again later.")
-		})
-		.finally(() => {
-			loadingPurge.value = false
-		})
-}
-*/
 useResizeObserver(header, entries => {
 	const entry = entries[0]
 	const { width } = entry.contentRect
@@ -270,5 +256,23 @@ onBeforeMount(() => {
 		container-type: inline-size;
 		min-height: 200px;
 	}
+
+	.actions-box {
+		overflow: hidden;
+		display: grid;
+		grid-template-rows: 0fr;
+		padding-top: 0px;
+		opacity: 0;
+		transition:
+			opacity var(--router-transition-duration) ease-out,
+			grid-template-rows var(--router-transition-duration) ease-out,
+			padding-top var(--router-transition-duration) ease-out;
+
+		&.open {
+			grid-template-rows: 1fr;
+			opacity: 1;
+			@apply pt-3;
+		}
+	}
 }
 </style>
diff --git a/frontend/src/components/sigma/QueryDeleteProvider.vue b/frontend/src/components/sigma/QueryDeleteProvider.vue
deleted file mode 100644
index 3be96ae96..000000000
--- a/frontend/src/components/sigma/QueryDeleteProvider.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-	<n-popover trigger="click" to="body" content-class="px-0" v-model:show="show">
-		<template #trigger>
-			<slot :loading />
-		</template>
-
-		<div class="py-1 flex gap-2">
-			<n-input-group>
-				<n-select
-					v-model:value="model.unit"
-					:options="unitOptions"
-					placeholder="Time unit"
-					:disabled="loading"
-					class="!w-28"
-				/>
-				<n-input-number
-					v-model:value="model.time"
-					:min="1"
-					clearable
-					placeholder="Time"
-					class="!w-32"
-					:disabled="loading"
-				/>
-			</n-input-group>
-
-			<n-button :disabled="!dirty || !isValid" :loading @click="updateTimeInterval()" type="primary">
-				Save
-			</n-button>
-		</div>
-	</n-popover>
-</template>
-
-<script setup lang="ts">
-import { computed, onBeforeMount, ref, toRefs, watch } from "vue"
-import { NSelect, NInputGroup, NButton, NInputNumber, NPopover, useMessage } from "naive-ui"
-import Api from "@/api"
-import type { SigmaQuery, SigmaTimeInterval, SigmaTimeIntervalUnit } from "@/types/sigma.d"
-
-const props = defineProps<{
-	query: SigmaQuery
-}>()
-const { query } = toRefs(props)
-
-const emit = defineEmits<{
-	(e: "deleted", value: SigmaQuery): void
-}>()
-
-const show = ref(false)
-const loading = ref(false)
-const message = useMessage()
-const model = ref<{ time: number; unit: SigmaTimeIntervalUnit }>({ time: 1, unit: "m" })
-const unitOptions = [
-	{ label: "Minutes", value: "m" },
-	{ label: "Hours", value: "h" },
-	{ label: "Days", value: "d" }
-]
-const timeUnit = ref<SigmaTimeIntervalUnit>("m")
-const timeValue = ref<number>(1)
-
-const timeInterval = computed<SigmaTimeInterval>(() => `${timeValue.value}${timeUnit.value}`)
-const modelTimeInterval = computed<SigmaTimeInterval>(() => `${model.value.time}${model.value.unit}`)
-
-const dirty = computed(() => timeInterval.value !== modelTimeInterval.value)
-const isValid = computed(() => model.value.time && model.value.unit)
-
-watch(show, val => {
-	if (val && !loading.value) {
-		setModel()
-	}
-})
-
-function setModel() {
-	if (query.value.time_interval) {
-		timeUnit.value = (
-			query.value.time_interval.match(/[a-z]/i)?.[0] || "m"
-		).toLocaleLowerCase() as SigmaTimeIntervalUnit
-		timeValue.value = parseInt(query.value.time_interval.match(/\d+/)?.[0] || "1")
-
-		model.value.unit = timeUnit.value
-		model.value.time = timeValue.value
-	}
-}
-
-function updateTimeInterval() {
-	if (query.value.rule_name && modelTimeInterval.value) {
-		loading.value = true
-
-		Api.sigma
-			.setQueryTimeInterval(query.value.rule_name, modelTimeInterval.value)
-			.then(res => {
-				if (res.data.success) {
-					emit("deleted", res.data.sigma_queries[0])
-				} else {
-					message.warning(res.data?.message || "An error occurred. Please try again later.")
-				}
-			})
-			.catch(err => {
-				message.error(err.response?.data?.message || "An error occurred. Please try again later.")
-			})
-			.finally(() => {
-				loading.value = false
-			})
-	}
-}
-
-onBeforeMount(() => {
-	setModel()
-})
-</script>
diff --git a/frontend/src/components/sigma/QueryDetails.vue b/frontend/src/components/sigma/QueryDetails.vue
index 605e2b267..3268ef76d 100644
--- a/frontend/src/components/sigma/QueryDetails.vue
+++ b/frontend/src/components/sigma/QueryDetails.vue
@@ -1,5 +1,5 @@
 <template>
-	<n-tabs type="line" animated :tabs-padding="24" v-if="query" class="grow" pane-wrapper-class="flex flex-col grow">
+	<n-tabs type="line" animated :tabs-padding="24" class="grow" pane-wrapper-class="flex flex-col grow">
 		<n-tab-pane name="Overview" tab="Overview" display-directive="show:lazy" class="flex flex-col grow">
 			<div class="pt-1">
 				<QueryOverview :query @updated="updateQuery($event)" @deleted="emit('deleted', query)" />
@@ -21,16 +21,16 @@ import type { SigmaQuery } from "@/types/sigma.d"
 const QueryOverview = defineAsyncComponent(() => import("./QueryOverview.vue"))
 const CodeSource = defineAsyncComponent(() => import("@/components/common/CodeSource.vue"))
 
-const props = defineProps<{
-	query: SigmaQuery
-}>()
-const { query } = toRefs(props)
-
 const emit = defineEmits<{
 	(e: "deleted", value: SigmaQuery): void
 	(e: "updated", value: SigmaQuery): void
 }>()
 
+const props = defineProps<{
+	query: SigmaQuery
+}>()
+const { query } = toRefs(props)
+
 function updateQuery(updatedQuery: SigmaQuery) {
 	emit("updated", updatedQuery)
 }
diff --git a/frontend/src/components/sigma/QueryItem.vue b/frontend/src/components/sigma/QueryItem.vue
index 628492cc4..9a82a5053 100644
--- a/frontend/src/components/sigma/QueryItem.vue
+++ b/frontend/src/components/sigma/QueryItem.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="sigma-query-item" :class="{ embedded }" @click="openDetails()">
 		<n-spin :show="loading">
-			<div class="flex flex-col" v-if="query">
+			<div class="flex flex-col">
 				<div class="header-box px-5 py-3 pb-0 flex justify-between items-center">
 					<div class="id flex items-center gap-2 cursor-pointer" @click="openDetails()">
 						<span>#{{ query.id }}</span>
@@ -23,12 +23,12 @@
 
 				<div class="footer-box px-5 py-3 flex justify-between items-center gap-4">
 					<div class="badges-box flex flex-wrap items-center gap-3">
-						<QueryTimeIntervalFormProvider
+						<QueryTimeIntervalForm
 							:query
-							v-slot="{ loading: loadingTimeInterval }"
+							v-slot="{ loading: loadingTimeInterval, togglePopup: toggleTimeIntervalPopup }"
 							@updated="updateQuery($event)"
 						>
-							<Badge type="splitted" bright pointCursor>
+							<Badge type="splitted" bright pointCursor @click.stop="toggleTimeIntervalPopup()">
 								<template #iconLeft>
 									<n-spin
 										:size="12"
@@ -46,7 +46,7 @@
 									</div>
 								</template>
 							</Badge>
-						</QueryTimeIntervalFormProvider>
+						</QueryTimeIntervalForm>
 
 						<Badge type="splitted" bright fluid class="!hidden sm:!flex">
 							<template #iconLeft>
@@ -65,13 +65,15 @@
 						</Badge>
 					</div>
 					<div class="actions-box">
-						<QueryDeleteProvider
+						<QueryDeleteOne
 							:query
-							v-slot="{ loading: loadingDelete }"
+							v-slot="{ loading: loadingDelete, togglePopup: toggleDeletePopup }"
 							@deleted="emit('deleted', query)"
 						>
-							<n-button quaternary size="tiny" :loading="loadingDelete">Delete</n-button>
-						</QueryDeleteProvider>
+							<n-button quaternary size="tiny" :loading="loadingDelete" @click.stop="toggleDeletePopup()">
+								Delete
+							</n-button>
+						</QueryDeleteOne>
 					</div>
 				</div>
 			</div>
@@ -91,7 +93,7 @@
 				segmented
 				role="modal"
 			>
-				<QueryDetails v-if="query" :query @deleted="emitDelete(query)" @updated="updateQuery($event)" />
+				<QueryDetails :query @deleted="emitDelete(query)" @updated="updateQuery($event)" />
 			</n-card>
 		</n-modal>
 	</div>
@@ -104,22 +106,22 @@ import { useSettingsStore } from "@/stores/settings"
 import { formatDate } from "@/utils"
 import Icon from "@/components/common/Icon.vue"
 import Badge from "@/components/common/Badge.vue"
-import QueryTimeIntervalFormProvider from "./QueryTimeIntervalFormProvider.vue"
-import QueryDeleteProvider from "./QueryDeleteProvider.vue"
+import QueryTimeIntervalForm from "./actionsProviders/QueryTimeIntervalForm.vue"
+import QueryDeleteOne from "./actionsProviders/QueryDeleteOne.vue"
 import QueryDetails from "./QueryDetails.vue"
 import type { SigmaQuery } from "@/types/sigma.d"
 
+const emit = defineEmits<{
+	(e: "deleted", value: SigmaQuery): void
+	(e: "updated", value: SigmaQuery): void
+}>()
+
 const props = defineProps<{
 	query: SigmaQuery
 	embedded?: boolean
 }>()
 const { query, embedded } = toRefs(props)
 
-const emit = defineEmits<{
-	(e: "deleted", value: SigmaQuery): void
-	(e: "updated", value: SigmaQuery): void
-}>()
-
 const TimeIcon = "carbon:time"
 const EditIcon = "uil:edit-alt"
 const EnabledIcon = "carbon:circle-solid"
@@ -135,7 +137,7 @@ function updateQuery(updatedQuery: SigmaQuery) {
 }
 
 function emitDelete(updatedQuery: SigmaQuery) {
-	showDetails.value = false
+	closeDetails()
 	emit("deleted", updatedQuery)
 }
 
@@ -177,10 +179,6 @@ function closeDetails() {
 		border-top: var(--border-small-100);
 		font-size: 13px;
 		background-color: var(--bg-secondary-color);
-
-		.time {
-			display: none;
-		}
 	}
 
 	&.embedded {
@@ -190,18 +188,5 @@ function closeDetails() {
 	&:hover {
 		box-shadow: 0px 0px 0px 1px var(--primary-color);
 	}
-
-	@container (max-width: 600px) {
-		.header-box {
-			.time {
-				display: none;
-			}
-		}
-		.footer-box {
-			.time {
-				display: flex;
-			}
-		}
-	}
 }
 </style>
diff --git a/frontend/src/components/sigma/QueryOverview.vue b/frontend/src/components/sigma/QueryOverview.vue
index 1a634c86b..b66d38c7f 100644
--- a/frontend/src/components/sigma/QueryOverview.vue
+++ b/frontend/src/components/sigma/QueryOverview.vue
@@ -12,12 +12,13 @@
 						</template>
 						<template #value>
 							<div class="flex">
-								<QueryActiveFormProvider
+								<QueryActiveForm
 									:query
-									v-slot="{ loading: loadingActive }"
+									v-slot="{ loading: loadingActive, togglePopup: toggleActivePopup }"
 									@updated="updateQuery($event)"
 								>
 									<div
+										@click.stop="toggleActivePopup()"
 										class="flex gap-3 items-center"
 										:class="{
 											'cursor-not-allowed': loadingActive,
@@ -33,7 +34,7 @@
 											<Icon :name="EditIcon" />
 										</n-spin>
 									</div>
-								</QueryActiveFormProvider>
+								</QueryActiveForm>
 							</div>
 						</template>
 					</KVCard>
@@ -47,12 +48,13 @@
 						</template>
 						<template #value>
 							<div class="flex">
-								<QueryTimeIntervalFormProvider
+								<QueryTimeIntervalForm
 									:query
-									v-slot="{ loading: loadingTimeInterval }"
+									v-slot="{ loading: loadingTimeInterval, togglePopup: toggleTimeIntervalPopup }"
 									@updated="updateQuery($event)"
 								>
 									<div
+										@click.stop="toggleTimeIntervalPopup()"
 										class="flex gap-3 items-center"
 										:class="{
 											'cursor-not-allowed': loadingTimeInterval,
@@ -68,7 +70,7 @@
 											<Icon :name="EditIcon" />
 										</n-spin>
 									</div>
-								</QueryTimeIntervalFormProvider>
+								</QueryTimeIntervalForm>
 							</div>
 						</template>
 					</KVCard>
@@ -105,12 +107,16 @@
 			<div class="footer-box px-7 py-4 flex items-center gap-2">
 				<div class="grow"></div>
 
-				<QueryDeleteProvider :query v-slot="{ loading: loadingDelete }" @deleted="emit('deleted', query)">
-					<n-button type="error" secondary :loading="loadingDelete">
+				<QueryDeleteOne
+					:query
+					v-slot="{ loading: loadingDelete, togglePopup: toggleDeletePopup }"
+					@deleted="emit('deleted', query)"
+				>
+					<n-button type="error" secondary :loading="loadingDelete" @click.stop="toggleDeletePopup()">
 						<template #icon><Icon :name="TrashIcon" /></template>
 						Delete
 					</n-button>
-				</QueryDeleteProvider>
+				</QueryDeleteOne>
 			</div>
 		</div>
 	</n-spin>
@@ -119,23 +125,23 @@
 <script setup lang="ts">
 import { ref, toRefs } from "vue"
 import { NButton, NSpin } from "naive-ui"
-import QueryActiveFormProvider from "./QueryActiveFormProvider.vue"
-import QueryTimeIntervalFormProvider from "./QueryTimeIntervalFormProvider.vue"
-import QueryDeleteProvider from "./QueryDeleteProvider.vue"
+import QueryActiveForm from "./actionsProviders/QueryActiveForm.vue"
+import QueryTimeIntervalForm from "./actionsProviders/QueryTimeIntervalForm.vue"
+import QueryDeleteOne from "./actionsProviders/QueryDeleteOne.vue"
 import KVCard from "@/components/common/KVCard.vue"
 import Icon from "@/components/common/Icon.vue"
 import { formatDate } from "@/utils"
 import { useSettingsStore } from "@/stores/settings"
 import type { SigmaQuery } from "@/types/sigma.d"
 
-const props = defineProps<{ query: SigmaQuery }>()
-const { query } = toRefs(props)
-
 const emit = defineEmits<{
 	(e: "deleted", value: SigmaQuery): void
 	(e: "updated", value: SigmaQuery): void
 }>()
 
+const props = defineProps<{ query: SigmaQuery }>()
+const { query } = toRefs(props)
+
 const TrashIcon = "carbon:trash-can"
 const TimeIntervalIcon = "material-symbols:autoplay"
 const EditIcon = "uil:edit-alt"
diff --git a/frontend/src/components/sigma/QueryTimeIntervalFormProvider.vue b/frontend/src/components/sigma/QueryTimeIntervalFormProvider.vue
deleted file mode 100644
index 059697f88..000000000
--- a/frontend/src/components/sigma/QueryTimeIntervalFormProvider.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-	<n-popover trigger="click" to="body" content-class="px-0" v-model:show="show">
-		<template #trigger>
-			<slot :loading />
-		</template>
-
-		<div class="py-1 flex gap-2">
-			<n-input-group>
-				<n-select
-					v-model:value="model.unit"
-					:options="unitOptions"
-					placeholder="Time unit"
-					:disabled="loading"
-					class="!w-28"
-				/>
-				<n-input-number
-					v-model:value="model.time"
-					:min="1"
-					clearable
-					placeholder="Time"
-					class="!w-32"
-					:disabled="loading"
-				/>
-			</n-input-group>
-
-			<n-button :disabled="!dirty || !isValid" :loading @click="updateTimeInterval()" type="primary">
-				Save
-			</n-button>
-		</div>
-	</n-popover>
-</template>
-
-<script setup lang="ts">
-import { computed, onBeforeMount, ref, toRefs, watch } from "vue"
-import { NSelect, NInputGroup, NButton, NInputNumber, NPopover, useMessage } from "naive-ui"
-import Api from "@/api"
-import type { SigmaQuery, SigmaTimeInterval, SigmaTimeIntervalUnit } from "@/types/sigma.d"
-
-const props = defineProps<{
-	query: SigmaQuery
-}>()
-const { query } = toRefs(props)
-
-const emit = defineEmits<{
-	(e: "updated", value: SigmaQuery): void
-}>()
-
-const show = ref(false)
-const loading = ref(false)
-const message = useMessage()
-const model = ref<{ time: number; unit: SigmaTimeIntervalUnit }>({ time: 1, unit: "m" })
-const unitOptions = [
-	{ label: "Minutes", value: "m" },
-	{ label: "Hours", value: "h" },
-	{ label: "Days", value: "d" }
-]
-const timeUnit = ref<SigmaTimeIntervalUnit>("m")
-const timeValue = ref<number>(1)
-
-const timeInterval = computed<SigmaTimeInterval>(() => `${timeValue.value}${timeUnit.value}`)
-const modelTimeInterval = computed<SigmaTimeInterval>(() => `${model.value.time}${model.value.unit}`)
-
-const dirty = computed(() => timeInterval.value !== modelTimeInterval.value)
-const isValid = computed(() => model.value.time && model.value.unit)
-
-watch(show, val => {
-	if (val && !loading.value) {
-		setModel()
-	}
-})
-
-function setModel() {
-	if (query.value.time_interval) {
-		timeUnit.value = (
-			query.value.time_interval.match(/[a-z]/i)?.[0] || "m"
-		).toLocaleLowerCase() as SigmaTimeIntervalUnit
-		timeValue.value = parseInt(query.value.time_interval.match(/\d+/)?.[0] || "1")
-
-		model.value.unit = timeUnit.value
-		model.value.time = timeValue.value
-	}
-}
-
-function updateTimeInterval() {
-	if (query.value.rule_name && modelTimeInterval.value) {
-		loading.value = true
-
-		Api.sigma
-			.setQueryTimeInterval(query.value.rule_name, modelTimeInterval.value)
-			.then(res => {
-				if (res.data.success) {
-					emit("updated", res.data.sigma_queries[0])
-				} else {
-					message.warning(res.data?.message || "An error occurred. Please try again later.")
-				}
-			})
-			.catch(err => {
-				message.error(err.response?.data?.message || "An error occurred. Please try again later.")
-			})
-			.finally(() => {
-				loading.value = false
-			})
-	}
-}
-
-onBeforeMount(() => {
-	setModel()
-})
-</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryActiveAllForm.vue b/frontend/src/components/sigma/actionsProviders/QueryActiveAllForm.vue
new file mode 100644
index 000000000..9f1f1bd84
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryActiveAllForm.vue
@@ -0,0 +1,69 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-2 justify-center min-w-52">
+			<div class="flex gap-2 items-center">
+				<n-button :loading @click="updateActive(true)" type="success">Activates all Sigma queries</n-button>
+				<n-button :loading @click="updateActive(false)">Deactivates all Sigma queries</n-button>
+			</div>
+
+			<p class="text-right">* It may take several minutes</p>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue"
+import { NButton, NPopover, useMessage } from "naive-ui"
+import Api from "@/api"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function updateActive(active: boolean) {
+	loading.value = true
+
+	const methods = active ? "activateAllQueries" : "deactivateAllQueries"
+
+	Api.sigma[methods]()
+		.then(res => {
+			if (res.data.success) {
+				emit("updated")
+				message.success(res.data?.message || "Sigma queries updated successfully")
+			} else {
+				message.warning(res.data?.message || "An error occurred. Please try again later.")
+			}
+		})
+		.catch(err => {
+			message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryActiveForm.vue b/frontend/src/components/sigma/actionsProviders/QueryActiveForm.vue
new file mode 100644
index 000000000..b54aad2d3
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryActiveForm.vue
@@ -0,0 +1,95 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-4 justify-center min-w-52">
+			<div class="flex gap-2 items-center justify-center py-3">
+				<span>Active</span>
+				<n-switch v-model:value="model.active" :disabled="loading" />
+			</div>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :disabled="!dirty" :loading @click="updateActive()" type="primary" size="small">
+					Save
+				</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { computed, onBeforeMount, ref, toRefs, watch } from "vue"
+import { NButton, NPopover, NSwitch, useMessage } from "naive-ui"
+import Api from "@/api"
+import type { SigmaQuery } from "@/types/sigma.d"
+
+const emit = defineEmits<{
+	(e: "updated", value: SigmaQuery): void
+}>()
+
+const props = defineProps<{
+	query: SigmaQuery
+}>()
+const { query } = toRefs(props)
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+const model = ref<{ active: boolean }>({ active: false })
+const active = ref<boolean>(false)
+const dirty = computed(() => active.value !== model.value.active)
+
+watch(show, val => {
+	if (val && !loading.value) {
+		setModel()
+	}
+})
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function setModel() {
+	active.value = !!query.value.active
+	model.value.active = active.value
+}
+
+function updateActive() {
+	if (query.value.rule_name) {
+		loading.value = true
+
+		Api.sigma
+			.setQueryActive(query.value.rule_name, model.value.active)
+			.then(res => {
+				if (res.data.success) {
+					emit("updated", res.data.sigma_queries[0])
+					message.success(res.data?.message || "Sigma query updated successfully")
+				} else {
+					message.warning(res.data?.message || "An error occurred. Please try again later.")
+				}
+			})
+			.catch(err => {
+				message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+			})
+			.finally(() => {
+				loading.value = false
+			})
+	}
+}
+
+onBeforeMount(() => {
+	setModel()
+})
+</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryDeleteAll.vue b/frontend/src/components/sigma/actionsProviders/QueryDeleteAll.vue
new file mode 100644
index 000000000..6ee13f9bf
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryDeleteAll.vue
@@ -0,0 +1,66 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-2 max-w-80">
+			<div>This will remove ALL Sigma queries, are you sure you want to proceed?</div>
+
+			<p class="text-right">* It may take several minutes</p>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :loading @click="deleteQueries()" type="primary" size="small">Yes I'm sure</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue"
+import { NButton, NPopover, useMessage } from "naive-ui"
+import Api from "@/api"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function deleteQueries() {
+	loading.value = true
+
+	Api.sigma
+		.deleteAllRules()
+		.then(res => {
+			if (res.data.success) {
+				emit("updated")
+				message.success(res.data?.message || "Sigma queries deleted successfully")
+			} else {
+				message.warning(res.data?.message || "An error occurred. Please try again later.")
+			}
+		})
+		.catch(err => {
+			message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryDeleteOne.vue b/frontend/src/components/sigma/actionsProviders/QueryDeleteOne.vue
new file mode 100644
index 000000000..de73b0e85
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryDeleteOne.vue
@@ -0,0 +1,81 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-4">
+			<div>
+				Are you sure you want to delete the Query
+				<strong>#{{ query.id }}</strong>
+				?
+			</div>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :loading @click="deleteQuery()" type="error" size="small">
+					<template #icon><Icon :name="TrashIcon" /></template>
+					Delete Query
+				</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { ref, toRefs } from "vue"
+import { NButton, NPopover, useMessage } from "naive-ui"
+import Icon from "@/components/common/Icon.vue"
+import Api from "@/api"
+import type { SigmaQuery } from "@/types/sigma.d"
+
+const emit = defineEmits<{
+	(e: "deleted", value: SigmaQuery): void
+}>()
+
+const props = defineProps<{
+	query: SigmaQuery
+}>()
+const { query } = toRefs(props)
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const TrashIcon = "carbon:trash-can"
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function deleteQuery() {
+	if (query.value.rule_name) {
+		loading.value = true
+
+		Api.sigma
+			.deleteRule(query.value.rule_name)
+			.then(res => {
+				if (res.data.success) {
+					emit("deleted", query.value)
+					message.success(res.data?.message || "Sigma query deleted successfully")
+				} else {
+					message.warning(res.data?.message || "An error occurred. Please try again later.")
+				}
+			})
+			.catch(err => {
+				message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+			})
+			.finally(() => {
+				loading.value = false
+			})
+	}
+}
+</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryDownloadAll.vue b/frontend/src/components/sigma/actionsProviders/QueryDownloadAll.vue
new file mode 100644
index 000000000..48fd134d4
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryDownloadAll.vue
@@ -0,0 +1,64 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-4 max-w-80">
+			<div>This will download ALL Sigma queries, are you sure you want to proceed?</div>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :loading @click="downloadQueries()" type="primary" size="small">Yes I'm sure</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue"
+import { NButton, NPopover, useMessage } from "naive-ui"
+import Api from "@/api"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function downloadQueries() {
+	loading.value = true
+
+	Api.sigma
+		.downloadRules()
+		.then(res => {
+			if (res.data.success) {
+				emit("updated")
+				message.success(res.data?.message || "Sigma queries downloaded successfully")
+			} else {
+				message.warning(res.data?.message || "An error occurred. Please try again later.")
+			}
+		})
+		.catch(err => {
+			message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/frontend/src/components/sigma/QueryActiveFormProvider.vue b/frontend/src/components/sigma/actionsProviders/QueryTimeIntervalForm.vue
similarity index 63%
rename from frontend/src/components/sigma/QueryActiveFormProvider.vue
rename to frontend/src/components/sigma/actionsProviders/QueryTimeIntervalForm.vue
index 059697f88..0a05adc18 100644
--- a/frontend/src/components/sigma/QueryActiveFormProvider.vue
+++ b/frontend/src/components/sigma/actionsProviders/QueryTimeIntervalForm.vue
@@ -1,31 +1,42 @@
 <template>
-	<n-popover trigger="click" to="body" content-class="px-0" v-model:show="show">
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
 		<template #trigger>
-			<slot :loading />
+			<slot :loading :togglePopup />
 		</template>
 
-		<div class="py-1 flex gap-2">
-			<n-input-group>
-				<n-select
-					v-model:value="model.unit"
-					:options="unitOptions"
-					placeholder="Time unit"
-					:disabled="loading"
-					class="!w-28"
-				/>
-				<n-input-number
-					v-model:value="model.time"
-					:min="1"
-					clearable
-					placeholder="Time"
-					class="!w-32"
-					:disabled="loading"
-				/>
-			</n-input-group>
-
-			<n-button :disabled="!dirty || !isValid" :loading @click="updateTimeInterval()" type="primary">
-				Save
-			</n-button>
+		<div class="py-1 flex flex-col gap-4">
+			<div class="flex gap-2 items-center">
+				<n-input-group>
+					<n-select
+						v-model:value="model.unit"
+						:options="unitOptions"
+						placeholder="Time unit"
+						:disabled="loading"
+						class="!w-28"
+					/>
+					<n-input-number
+						v-model:value="model.time"
+						:min="1"
+						clearable
+						placeholder="Time"
+						class="!w-32"
+						:disabled="loading"
+					/>
+				</n-input-group>
+			</div>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button
+					:disabled="!dirty || !isValid"
+					:loading
+					@click="updateTimeInterval()"
+					type="primary"
+					size="small"
+				>
+					Save
+				</n-button>
+			</div>
 		</div>
 	</n-popover>
 </template>
@@ -36,17 +47,19 @@ import { NSelect, NInputGroup, NButton, NInputNumber, NPopover, useMessage } fro
 import Api from "@/api"
 import type { SigmaQuery, SigmaTimeInterval, SigmaTimeIntervalUnit } from "@/types/sigma.d"
 
+const emit = defineEmits<{
+	(e: "updated", value: SigmaQuery): void
+}>()
+
 const props = defineProps<{
 	query: SigmaQuery
 }>()
 const { query } = toRefs(props)
 
-const emit = defineEmits<{
-	(e: "updated", value: SigmaQuery): void
-}>()
+const loading = defineModel<boolean | undefined>("loading", { default: false })
 
 const show = ref(false)
-const loading = ref(false)
+const lastShow = ref(new Date().getTime())
 const message = useMessage()
 const model = ref<{ time: number; unit: SigmaTimeIntervalUnit }>({ time: 1, unit: "m" })
 const unitOptions = [
@@ -69,6 +82,17 @@ watch(show, val => {
 	}
 })
 
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
 function setModel() {
 	if (query.value.time_interval) {
 		timeUnit.value = (
@@ -90,6 +114,7 @@ function updateTimeInterval() {
 			.then(res => {
 				if (res.data.success) {
 					emit("updated", res.data.sigma_queries[0])
+					message.success(res.data?.message || "Sigma query updated successfully")
 				} else {
 					message.warning(res.data?.message || "An error occurred. Please try again later.")
 				}
diff --git a/frontend/src/components/sigma/actionsProviders/QueryUploadDB.vue b/frontend/src/components/sigma/actionsProviders/QueryUploadDB.vue
new file mode 100644
index 000000000..22ccda1ad
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryUploadDB.vue
@@ -0,0 +1,76 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-2 max-w-80 min-w-72">
+			<div>Choose the level to load:</div>
+
+			<n-checkbox-group v-model:value="ruleLevels" class="flex gap-4" :disabled="loading">
+				<n-checkbox value="high" label="High" />
+				<n-checkbox value="critical" label="Critical" />
+			</n-checkbox-group>
+
+			<p class="text-right">* It may take several minutes</p>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :disabled="!isValid" :loading @click="uploadQueries()" type="primary" size="small">
+					Upload
+				</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue"
+import { NButton, NPopover, NCheckboxGroup, NCheckbox, useMessage } from "naive-ui"
+import Api from "@/api"
+import type { SigmaRuleLevels } from "@/types/sigma.d"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+const ruleLevels = ref<SigmaRuleLevels[]>([])
+const isValid = computed(() => !!ruleLevels.value.length)
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function uploadQueries() {
+	loading.value = true
+
+	Api.sigma
+		.uploadRules(ruleLevels.value)
+		.then(res => {
+			if (res.data.success) {
+				emit("updated")
+				message.success(res.data?.message || "Successfully uploaded the Sigma queries to the database")
+			} else {
+				message.warning(res.data?.message || "An error occurred. Please try again later.")
+			}
+		})
+		.catch(err => {
+			message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/frontend/src/components/sigma/actionsProviders/QueryUploadFile.vue b/frontend/src/components/sigma/actionsProviders/QueryUploadFile.vue
new file mode 100644
index 000000000..a99e8f697
--- /dev/null
+++ b/frontend/src/components/sigma/actionsProviders/QueryUploadFile.vue
@@ -0,0 +1,88 @@
+<template>
+	<n-popover trigger="manual" to="body" content-class="px-0" v-model:show="show" @clickoutside="closePopup()">
+		<template #trigger>
+			<slot :loading :togglePopup />
+		</template>
+
+		<div class="py-1 flex flex-col gap-2 max-w-80">
+			<n-upload
+				:max="1"
+				accept="application/x-yaml, .yaml, .YAML, .yml, .YML"
+				v-model:file-list="fileList"
+				:disabled="loading"
+			>
+				<n-upload-dragger>
+					<div>
+						<Icon :name="UploadIcon" :size="28" :depth="3"></Icon>
+					</div>
+					<div class="font-semibold">Click or drag a file to this area to upload</div>
+					<p class="mt-2">Only .yaml files are accepted</p>
+				</n-upload-dragger>
+			</n-upload>
+
+			<div class="flex gap-2 justify-between">
+				<n-button @click="closePopup()" quaternary size="small">Close</n-button>
+				<n-button :disabled="!isValid" :loading @click="uploadQueries()" type="primary" size="small">
+					Upload
+				</n-button>
+			</div>
+		</div>
+	</n-popover>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue"
+import { NButton, NPopover, NUpload, NUploadDragger, useMessage, type UploadFileInfo } from "naive-ui"
+import Api from "@/api"
+import Icon from "@/components/common/Icon.vue"
+
+const emit = defineEmits<{
+	(e: "updated"): void
+}>()
+
+const loading = defineModel<boolean | undefined>("loading", { default: false })
+
+const UploadIcon = "carbon:document-add"
+
+const show = ref(false)
+const lastShow = ref(new Date().getTime())
+const message = useMessage()
+const fileList = ref<UploadFileInfo[]>([])
+const yamlFile = computed<File | null>(() => fileList.value?.[0].file || null)
+const isValid = computed(() => fileList.value.length)
+
+function togglePopup() {
+	if (new Date().getTime() - lastShow.value > 500) {
+		show.value = !show.value
+	}
+}
+
+function closePopup() {
+	lastShow.value = new Date().getTime()
+	show.value = false
+}
+
+function uploadQueries() {
+	loading.value = true
+
+	if (yamlFile.value) {
+		Api.sigma
+			.uploadRulesFile(yamlFile.value)
+			.then(res => {
+				if (res.data.success) {
+					emit("updated")
+					fileList.value = []
+					message.success(res.data?.message || "Successfully uploaded the Sigma queries to the database")
+				} else {
+					message.warning(res.data?.message || "An error occurred. Please try again later.")
+				}
+			})
+			.catch(err => {
+				message.error(err.response?.data?.message || "An error occurred. Please try again later.")
+			})
+			.finally(() => {
+				loading.value = false
+			})
+	}
+}
+</script>