diff --git a/dashboards/victorialogs-cluster.json b/dashboards/victorialogs-cluster.json
index 4da2f85f3e..7126244be3 100644
--- a/dashboards/victorialogs-cluster.json
+++ b/dashboards/victorialogs-cluster.json
@@ -10588,7 +10588,7 @@
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
-        "regex": "/^(?<value>.*)-(?:vlinsert|vlstorage|vlselect|insert|storage|select)$/",
+        "regex": "/^(?:(?:(?:vl)?(?:insert|storage|select))(?:internal)?-)?(?<value>.+?)(?:-(?:(?:vl)?(?:insert|storage|select)))?$/",
         "type": "query"
       },
       {
@@ -10597,14 +10597,14 @@
           "type": "prometheus",
           "uid": "$DS_PROMETHEUS"
         },
-        "definition": "label_values(vm_app_version{job=~\"$job\", job=~\"$cluster.*\"}, job)",
+        "definition": "label_values(vm_app_version{job=~\"$job\", job=~\".*$cluster.*\"}, job)",
         "includeAll": true,
         "multi": true,
         "name": "job_cluster",
         "options": [],
         "query": {
           "qryType": 1,
-          "query": "label_values(vm_app_version{job=~\"$job\", job=~\"$cluster.*\"}, job)",
+          "query": "label_values(vm_app_version{job=~\"$job\", job=~\".*$cluster.*\"}, job)",
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
@@ -10717,7 +10717,7 @@
   "timezone": "",
   "title": "VictoriaLogs - cluster",
   "uid": "XqCOFEX4z",
-  "version": 5,
+  "version": 6,
   "weekStart": "",
   "id": null
 }
diff --git a/dashboards/vm/victorialogs-cluster.json b/dashboards/vm/victorialogs-cluster.json
index 8a1f8e12fb..e80ab535a1 100644
--- a/dashboards/vm/victorialogs-cluster.json
+++ b/dashboards/vm/victorialogs-cluster.json
@@ -10589,7 +10589,7 @@
           "refId": "VictoriaMetricsVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
-        "regex": "/^(?<value>.*)-(?:vlinsert|vlstorage|vlselect|insert|storage|select)$/",
+        "regex": "/^(?:(?:(?:vl)?(?:insert|storage|select))(?:internal)?-)?(?<value>.+?)(?:-(?:(?:vl)?(?:insert|storage|select)))?$/",
         "type": "query"
       },
       {
@@ -10598,14 +10598,14 @@
           "type": "victoriametrics-metrics-datasource",
           "uid": "$DS_PROMETHEUS"
         },
-        "definition": "label_values(vm_app_version{job=~\"$job\", job=~\"$cluster.*\"}, job)",
+        "definition": "label_values(vm_app_version{job=~\"$job\", job=~\".*$cluster.*\"}, job)",
         "includeAll": true,
         "multi": true,
         "name": "job_cluster",
         "options": [],
         "query": {
           "qryType": 1,
-          "query": "label_values(vm_app_version{job=~\"$job\", job=~\"$cluster.*\"}, job)",
+          "query": "label_values(vm_app_version{job=~\"$job\", job=~\".*$cluster.*\"}, job)",
           "refId": "VictoriaMetricsVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
@@ -10718,7 +10718,7 @@
   "timezone": "",
   "title": "VictoriaLogs - cluster (VM)",
   "uid": "XqCOFEX4z_vm",
-  "version": 5,
+  "version": 6,
   "weekStart": "",
   "id": null
 }