diff --git a/src/pages/ipa/resources/policies.mdx b/src/pages/ipa/resources/policies.mdx
index fc911abe..8b2a1482 100644
--- a/src/pages/ipa/resources/policies.mdx
+++ b/src/pages/ipa/resources/policies.mdx
@@ -167,7 +167,6 @@ echo $response;
     "name": "ch8i4ug6lnn4g9hqv7mg",
     "description": "This is a default policy that allows connections between all the resources",
     "enabled": true,
-    "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
     "rules": [
       {
         "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -208,7 +207,6 @@ echo $response;
     "name": "string",
     "description": "string",
     "enabled": "boolean",
-    "query": "string",
     "rules": [
       {
         "id": "string",
@@ -291,13 +289,6 @@ echo $response;
           Policy status
           </Property>
         
-          <Property name="query" type="string" required={true} 
-           
-           
-                               > 
-          Policy Rego query
-          </Property>
-        
           <Property name="rules" type="PolicyRuleUpdate[]" required={true} 
            
            
@@ -319,7 +310,6 @@ curl -X POST https://api.netbird.io/api/policies \
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -350,7 +340,6 @@ let data = JSON.stringify({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -403,7 +392,6 @@ payload = json.dumps({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -456,7 +444,6 @@ func main() {
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -527,7 +514,6 @@ request.body = JSON.dump({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -562,7 +548,6 @@ RequestBody body = RequestBody.create(mediaType, '{
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -613,7 +598,6 @@ curl_setopt_array($curl, array(
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -659,7 +643,6 @@ echo $response;
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -698,7 +681,6 @@ echo $response;
   "name": "string",
   "description": "string",
   "enabled": "boolean",
-  "query": "string",
   "rules": [
     {
       "id": "string",
@@ -911,7 +893,6 @@ echo $response;
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -950,7 +931,6 @@ echo $response;
   "name": "string",
   "description": "string",
   "enabled": "boolean",
-  "query": "string",
   "rules": [
     {
       "id": "string",
@@ -1040,13 +1020,6 @@ echo $response;
           Policy status
           </Property>
         
-          <Property name="query" type="string" required={true} 
-           
-           
-                               > 
-          Policy Rego query
-          </Property>
-        
           <Property name="rules" type="PolicyRuleUpdate[]" required={true} 
            
            
@@ -1068,7 +1041,6 @@ curl -X PUT https://api.netbird.io/api/policies/{policyId} \
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1099,7 +1071,6 @@ let data = JSON.stringify({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1152,7 +1123,6 @@ payload = json.dumps({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1205,7 +1175,6 @@ func main() {
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1276,7 +1245,6 @@ request.body = JSON.dump({
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1311,7 +1279,6 @@ RequestBody body = RequestBody.create(mediaType, '{
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1362,7 +1329,6 @@ curl_setopt_array($curl, array(
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1408,7 +1374,6 @@ echo $response;
   "name": "ch8i4ug6lnn4g9hqv7mg",
   "description": "This is a default policy that allows connections between all the resources",
   "enabled": true,
-  "query": "package netbird\\n\\nall[rule] {\\n is_peer_in_any_group([\\\"ch8i4ug6lnn4g9hqv7m0\\\",\\\"ch8i4ug6lnn4g9hqv7m0\\\"])\\n rule := {\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"dst\\\", \\\"accept\\\", \\\"\\\"),\\n rules_from_group(\\\"ch8i4ug6lnn4g9hqv7m0\\\", \\\"src\\\", \\\"accept\\\", \\\"\\\"),\\n }[_][_]\\n}\\n",
   "rules": [
     {
       "id": "ch8i4ug6lnn4g9hqv7mg",
@@ -1447,7 +1412,6 @@ echo $response;
   "name": "string",
   "description": "string",
   "enabled": "boolean",
-  "query": "string",
   "rules": [
     {
       "id": "string",