diff --git a/campus/bffs/enrollment/api/client.bal b/campus/bffs/enrollment/api/client.bal
index 09757086..c20529a1 100644
--- a/campus/bffs/enrollment/api/client.bal
+++ b/campus/bffs/enrollment/api/client.bal
@@ -35,7 +35,7 @@ public isolated client class GraphqlClient {
         return <GetPersonsResponse>check performDataBinding(graphqlResponse, GetPersonsResponse);
     }
     remote isolated function getPersonById(int id) returns GetPersonByIdResponse|graphql:ClientError {
-        string query = string `query getPersonById($id:Int!) {person_by_id(id:$id) {id preferred_name full_name date_of_birth sex asgardeo_id jwt_sub_id created updated jwt_email permanent_address {city {id name {name_en name_si name_ta}} street_address phone id} mailing_address {city {id name {name_en name_si name_ta}} street_address phone id} phone organization {id description notes address {id} avinya_type {id name} name {name_en} parent_organizations {id name {name_en}}} avinya_type_id notes nic_no passport_no id_no email street_address digital_id avinya_phone bank_name bank_account_number bank_account_name academy_org_id bank_branch created_by updated_by current_job}}`;
+        string query = string `query getPersonById($id:Int!) {person_by_id(id:$id) {id preferred_name full_name date_of_birth sex asgardeo_id jwt_sub_id created updated jwt_email mailing_address {city {id name {name_en name_si name_ta} district {id name {name_en}}} street_address phone id} phone organization {id description notes address {id} avinya_type {id name} name {name_en} parent_organizations {id name {name_en}}} avinya_type_id notes nic_no passport_no id_no email street_address digital_id avinya_phone bank_name bank_account_number bank_account_name academy_org_id bank_branch created_by updated_by current_job}}`;
         map<anydata> variables = {"id": id};
         json graphqlResponse = check self.graphqlClient->executeWithType(query, variables);
         return <GetPersonByIdResponse>check performDataBinding(graphqlResponse, GetPersonByIdResponse);
@@ -53,10 +53,10 @@ public isolated client class GraphqlClient {
         return <GetDistrictsResponse>check performDataBinding(graphqlResponse, GetDistrictsResponse);
     }
     remote isolated function getCities(int district_id) returns GetCitiesResponse|graphql:ClientError {
-        string query = string `query getCities($district_id:Int!) {cities(district_id:$district_id) {id name {name_en} district {id name {name_en}}}}`;
+        string query = string `query getCities($district_id:Int!) {cities(district_id:$district_id) {id name {name_en}}}`;
         map<anydata> variables = {"district_id": district_id};
         json graphqlResponse = check self.graphqlClient->executeWithType(query, variables);
-        return <GetCitiesResponse> check performDataBinding(graphqlResponse, GetCitiesResponse);
+        return <GetCitiesResponse>check performDataBinding(graphqlResponse, GetCitiesResponse);
     }
     remote isolated function getAllOrganizations() returns GetAllOrganizationsResponse|graphql:ClientError {
         string query = string `query getAllOrganizations {all_organizations {id name {name_en} address {id street_address} avinya_type {id name} description phone notes}}`;
diff --git a/campus/bffs/enrollment/api/types.bal b/campus/bffs/enrollment/api/types.bal
index e4694d8f..0ab9fc86 100644
--- a/campus/bffs/enrollment/api/types.bal
+++ b/campus/bffs/enrollment/api/types.bal
@@ -217,19 +217,12 @@ public type GetPersonByIdResponse record {|
                     string? name_si;
                     string? name_ta;
                 |} name;
-            |} city;
-            string? street_address;
-            int? phone;
-            int? id;
-        |}? permanent_address;
-        record {|
-            record {|
-                int? id;
                 record {|
-                    string? name_en;
-                    string? name_si;
-                    string? name_ta;
-                |} name;
+                    int? id;
+                    record {|
+                        string? name_en;
+                    |} name;
+                |} district;
             |} city;
             string? street_address;
             int? phone;
@@ -381,12 +374,6 @@ public type GetCitiesResponse record {|
         record {|
             string? name_en;
         |} name;
-        record {|
-            int? id;
-            record {|
-                string? name_en;
-            |} name;
-        |} district;
     |}[] cities;
 |};
 public type GetAvinyaTypesResponse record {|
diff --git a/campus/bffs/enrollment/graphql_client/enrollment.graphql b/campus/bffs/enrollment/graphql_client/enrollment.graphql
index 46554415..de66aee4 100644
--- a/campus/bffs/enrollment/graphql_client/enrollment.graphql
+++ b/campus/bffs/enrollment/graphql_client/enrollment.graphql
@@ -90,19 +90,6 @@ query getPersonById($id: Int!) {
     created
     updated
     jwt_email
-    permanent_address {
-      city {
-        id
-        name {
-          name_en
-          name_si
-          name_ta
-        }
-      }
-      street_address
-      phone
-      id
-    }
     mailing_address {
       city {
         id
@@ -111,6 +98,12 @@ query getPersonById($id: Int!) {
           name_si
           name_ta
         }
+        district {
+          id
+          name {
+            name_en
+          }
+        }
       }
       street_address
       phone
@@ -271,12 +264,6 @@ query getCities($district_id: Int!) {
     name {
       name_en
     }
-    district {
-      id
-      name {
-        name_en
-      }
-    }
   }
 }
 
diff --git a/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/client.bal b/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/client.bal
index cd589b02..b9ffc3be 100644
--- a/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/client.bal
+++ b/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/client.bal
@@ -34,7 +34,7 @@ public isolated client class GraphqlClient {
         return <GetPersonsResponse> check performDataBinding(graphqlResponse, GetPersonsResponse);
     }
     remote isolated function getPersonById(int id) returns GetPersonByIdResponse|graphql:ClientError {
-        string query = string `query getPersonById($id:Int!) {person_by_id(id:$id) {id preferred_name full_name date_of_birth sex asgardeo_id jwt_sub_id created updated jwt_email permanent_address {city {id name {name_en name_si name_ta}} street_address phone id} mailing_address {city {id name {name_en name_si name_ta}} street_address phone id} phone organization {id description notes address {id} avinya_type {id name} name {name_en} parent_organizations {id name {name_en}}} avinya_type_id notes nic_no passport_no id_no email street_address digital_id avinya_phone bank_name bank_account_number bank_account_name academy_org_id bank_branch created_by updated_by current_job}}`;
+        string query = string `query getPersonById($id:Int!) {person_by_id(id:$id) {id preferred_name full_name date_of_birth sex asgardeo_id jwt_sub_id created updated jwt_email mailing_address {city {id name {name_en name_si name_ta} district {id name {name_en}}} street_address phone id} phone organization {id description notes address {id} avinya_type {id name} name {name_en} parent_organizations {id name {name_en}}} avinya_type_id notes nic_no passport_no id_no email street_address digital_id avinya_phone bank_name bank_account_number bank_account_name academy_org_id bank_branch created_by updated_by current_job}}`;
         map<anydata> variables = {"id": id};
         json graphqlResponse = check self.graphqlClient->executeWithType(query, variables);
         return <GetPersonByIdResponse> check performDataBinding(graphqlResponse, GetPersonByIdResponse);
@@ -52,7 +52,7 @@ public isolated client class GraphqlClient {
         return <GetDistrictsResponse> check performDataBinding(graphqlResponse, GetDistrictsResponse);
     }
     remote isolated function getCities(int district_id) returns GetCitiesResponse|graphql:ClientError {
-        string query = string `query getCities($district_id:Int!) {cities(district_id:$district_id) {id name {name_en} district {id name {name_en}}}}`;
+        string query = string `query getCities($district_id:Int!) {cities(district_id:$district_id) {id name {name_en}}}`;
         map<anydata> variables = {"district_id": district_id};
         json graphqlResponse = check self.graphqlClient->executeWithType(query, variables);
         return <GetCitiesResponse> check performDataBinding(graphqlResponse, GetCitiesResponse);
diff --git a/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal b/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal
index f5a89fcf..c0a7539e 100644
--- a/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal
+++ b/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal
@@ -529,19 +529,12 @@ public type GetPersonByIdResponse record {|
                     string? name_si;
                     string? name_ta;
                 |} name;
-            |} city;
-            string? street_address;
-            int? phone;
-            int? id;
-        |}? permanent_address;
-        record {|
-            record {|
-                int? id;
                 record {|
-                    string? name_en;
-                    string? name_si;
-                    string? name_ta;
-                |} name;
+                    int? id;
+                    record {|
+                        string? name_en;
+                    |} name;
+                |} district;
             |} city;
             string? street_address;
             int? phone;
@@ -693,12 +686,6 @@ public type GetCitiesResponse record {|
         record {|
             string? name_en;
         |} name;
-        record {|
-            int? id;
-            record {|
-                string? name_en;
-            |} name;
-        |} district;
     |}[]? cities;
 |};