diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate
index bb6c751..29912e3 100644
--- a/terraform/terraform.tfstate
+++ b/terraform/terraform.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
-  "terraform_version": "1.14.4",
-  "serial": 17,
+  "terraform_version": "1.7.0",
+  "serial": 20,
   "lineage": "2e6257d6-c04c-6864-63e8-38721dda9040",
   "outputs": {
     "group_ids": {
@@ -48,8 +48,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -68,8 +67,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -88,8 +86,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -108,8 +105,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -150,7 +146,6 @@
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0,
           "dependencies": [
             "netbird_group.fusion_servers",
             "netbird_group.ground_stations"
@@ -197,7 +192,6 @@
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0,
           "dependencies": [
             "netbird_group.fusion_servers",
             "netbird_group.ground_stations",
@@ -244,7 +238,6 @@
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0,
           "dependencies": [
             "netbird_group.ground_stations",
             "netbird_group.pilots"
@@ -280,15 +273,7 @@
             "used_times": 0,
             "valid": true
           },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "key"
-              }
-            ]
-          ],
-          "identity_schema_version": 0,
+          "sensitive_attributes": [],
           "dependencies": [
             "netbird_group.ground_stations"
           ]
@@ -323,15 +308,7 @@
             "used_times": 0,
             "valid": true
           },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "key"
-              }
-            ]
-          ],
-          "identity_schema_version": 0,
+          "sensitive_attributes": [],
           "dependencies": [
             "netbird_group.pilots"
           ]
diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup
index e0fd7de..eecdf82 100644
--- a/terraform/terraform.tfstate.backup
+++ b/terraform/terraform.tfstate.backup
@@ -1,7 +1,7 @@
 {
   "version": 4,
-  "terraform_version": "1.14.4",
-  "serial": 9,
+  "terraform_version": "1.7.0",
+  "serial": 17,
   "lineage": "2e6257d6-c04c-6864-63e8-38721dda9040",
   "outputs": {
     "group_ids": {
@@ -20,6 +20,16 @@
           "pilots": "string"
         }
       ]
+    },
+    "gs_setup_key": {
+      "value": "A19E165B-A6EB-4494-AA1D-F85D3EA9D382",
+      "type": "string",
+      "sensitive": true
+    },
+    "pilot_setup_key": {
+      "value": "0267D2E9-E4A5-451C-A1BC-513F32A9FCD8",
+      "type": "string",
+      "sensitive": true
     }
   },
   "resources": [
@@ -38,8 +48,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -58,8 +67,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -78,8 +86,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -98,8 +105,7 @@
             "peers": [],
             "resources": []
           },
-          "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "sensitive_attributes": []
         }
       ]
     },
@@ -120,9 +126,11 @@
               {
                 "action": "accept",
                 "bidirectional": true,
-                "description": "Fusion to GS access",
+                "description": null,
                 "destination_resource": null,
-                "destinations": null,
+                "destinations": [
+                  "d68tmmml93fs73c93ejg"
+                ],
                 "enabled": true,
                 "id": "d68tmmul93fs73c93en0",
                 "name": "fusion-gs",
@@ -130,13 +138,18 @@
                 "ports": null,
                 "protocol": "all",
                 "source_resource": null,
-                "sources": null
+                "sources": [
+                  "d68tmmml93fs73c93ek0"
+                ]
               }
             ],
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "dependencies": [
+            "netbird_group.fusion_servers",
+            "netbird_group.ground_stations"
+          ]
         }
       ]
     },
@@ -157,9 +170,13 @@
               {
                 "action": "accept",
                 "bidirectional": true,
-                "description": "Full operator access",
+                "description": null,
                 "destination_resource": null,
-                "destinations": null,
+                "destinations": [
+                  "d68tmmml93fs73c93ejg",
+                  "d68tmmml93fs73c93ekg",
+                  "d68tmmml93fs73c93ek0"
+                ],
                 "enabled": true,
                 "id": "d68tmmul93fs73c93eng",
                 "name": "operator-all",
@@ -167,13 +184,20 @@
                 "ports": null,
                 "protocol": "all",
                 "source_resource": null,
-                "sources": null
+                "sources": [
+                  "d68tmmml93fs73c93el0"
+                ]
               }
             ],
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "dependencies": [
+            "netbird_group.fusion_servers",
+            "netbird_group.ground_stations",
+            "netbird_group.operators",
+            "netbird_group.pilots"
+          ]
         }
       ]
     },
@@ -194,9 +218,11 @@
               {
                 "action": "accept",
                 "bidirectional": true,
-                "description": "Pilots can access ground stations",
+                "description": null,
                 "destination_resource": null,
-                "destinations": null,
+                "destinations": [
+                  "d68tmmml93fs73c93ejg"
+                ],
                 "enabled": true,
                 "id": "d68tmmul93fs73c93epg",
                 "name": "pilot-gs-access",
@@ -204,13 +230,18 @@
                 "ports": null,
                 "protocol": "all",
                 "source_resource": null,
-                "sources": null
+                "sources": [
+                  "d68tmmml93fs73c93ekg"
+                ]
               }
             ],
             "source_posture_checks": null
           },
           "sensitive_attributes": [],
-          "identity_schema_version": 0
+          "dependencies": [
+            "netbird_group.ground_stations",
+            "netbird_group.pilots"
+          ]
         }
       ]
     },
@@ -229,15 +260,15 @@
             ],
             "ephemeral": false,
             "expires": "0001-01-01T00:00:00Z",
-            "expiry_seconds": null,
-            "id": "d68tmmul93fs73c93eo0",
-            "key": null,
+            "expiry_seconds": 0,
+            "id": "d68v8pml93fs73c93itg",
+            "key": "A19E165B-A6EB-4494-AA1D-F85D3EA9D382",
             "last_used": "0001-01-01T00:00:00Z",
             "name": "ground-station-onboarding",
             "revoked": false,
             "state": "valid",
             "type": "reusable",
-            "updated_at": "2026-02-15T14:42:35Z",
+            "updated_at": "2026-02-15T16:29:26Z",
             "usage_limit": 0,
             "used_times": 0,
             "valid": true
@@ -250,7 +281,9 @@
               }
             ]
           ],
-          "identity_schema_version": 0
+          "dependencies": [
+            "netbird_group.ground_stations"
+          ]
         }
       ]
     },
@@ -268,16 +301,16 @@
               "d68tmmml93fs73c93ekg"
             ],
             "ephemeral": false,
-            "expires": "2026-03-17T14:42:35Z",
-            "expiry_seconds": null,
-            "id": "d68tmmul93fs73c93eq0",
-            "key": null,
+            "expires": "0001-01-01T00:00:00Z",
+            "expiry_seconds": 0,
+            "id": "d68v8pml93fs73c93isg",
+            "key": "0267D2E9-E4A5-451C-A1BC-513F32A9FCD8",
             "last_used": "0001-01-01T00:00:00Z",
             "name": "pilot-onboarding",
             "revoked": false,
             "state": "valid",
             "type": "reusable",
-            "updated_at": "2026-02-15T14:42:35Z",
+            "updated_at": "2026-02-15T16:29:26Z",
             "usage_limit": 0,
             "used_times": 0,
             "valid": true
@@ -290,7 +323,9 @@
               }
             ]
           ],
-          "identity_schema_version": 0
+          "dependencies": [
+            "netbird_group.pilots"
+          ]
         }
       ]
     }