diff --git a/geonetwork-config/config.json b/geonetwork-config/config.json
index 63692b5..ffbc1ec 100644
--- a/geonetwork-config/config.json
+++ b/geonetwork-config/config.json
@@ -801,27 +801,35 @@
   },
   {
     "type": "harvesters",
-    "jsonFileName": "aims-imos.json"
+    "jsonFileName": "1_imos-craig-catalogue.json"
   },
   {
     "type": "harvesters",
-    "jsonFileName": "ga-marine.json"
+    "jsonFileName": "2_aims_nrs.json"
   },
   {
     "type": "harvesters",
-    "jsonFileName": "imos.json"
+    "jsonFileName": "3_csiro_hplc_pigment.json"
+  },
+  {
+    "type": "harvesters",
+    "jsonFileName": "4_aad.json"
+  },
+  {
+    "type": "harvesters",
+    "jsonFileName": "5_aims.json"
   },
   {
     "type": "harvesters",
-    "jsonFileName": "imos-catalogue.json"
+    "jsonFileName": "6_csiro_ocean_atmosphere.json"
   },
   {
     "type": "harvesters",
-    "jsonFileName": "imos-craig-catalogue.json"
+    "jsonFileName": "7_imas.json"
   },
   {
     "type": "harvesters",
-    "jsonFileName": "portal_catalogue_nesp_aodn_portal.json"
+    "jsonFileName": "8_ga-marine.json"
   },
   {
     "type": "settings",
diff --git a/geonetwork-config/harvesters/imos-craig-catalogue.json b/geonetwork-config/harvesters/1_imos-craig-catalogue.json
similarity index 59%
rename from geonetwork-config/harvesters/imos-craig-catalogue.json
rename to geonetwork-config/harvesters/1_imos-craig-catalogue.json
index ab5ba50..116698b 100644
--- a/geonetwork-config/harvesters/imos-craig-catalogue.json
+++ b/geonetwork-config/harvesters/1_imos-craig-catalogue.json
@@ -1,107 +1,129 @@
 {
-  "name": "craig: IMOS catalogue (still missing some but ok)",
-  "comments": "Migrate from RC geonetwork4",
+  "name": "1. craig: IMOS catalogue (still missing some but ok)",
+  "comments": "Migrate from Metatest geonetwork4",
   "harvester_data": {
     "node": {
-      "-id": "1207",
-      "-type": "csw",
       "owner": {
         "id": "1"
       },
-      "ownerGroup": {
-        "id": "101",
-        "name": "IMOS"
-      },
-      "ownerUser": {
-        "id": "undefined"
+      "privileges": {
+        "group": {
+          "-id": "1",
+          "operation": [
+            {
+              "-name": "view",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "dynamic",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "download",
+              "-self-closing": "true"
+            }
+          ]
+        }
       },
       "site": {
-        "name": "craig: IMOS catalogue (still missing some but ok)",
-        "uuid": "6062df7f-b931-4fc9-82a4-37ffc363a593",
+        "xpathFilter": {
+          "-self-closing": "true"
+        },
+        "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0",
+        "queryScope": "local",
+        "hopCount": "2",
+        "name": "1. craig: IMOS catalogue (still missing some but ok)",
+        "icon": "blank.png",
+        "capabilitiesUrl": "https://catalogue-imos.aodn.org.au/geonetwork/srv/eng/csw?request=GetCapabilities&service=CSW&version=2.0.2",
+        "sortBy": "identifier:A",
+        "uuid": "c4131347-15fe-42b8-a529-1fb40db1f94c",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
         "account": {
+          "password": {
+            "-self-closing": "true"
+          },
           "use": "false",
-          "username": {},
-          "password": {}
+          "username": {
+            "-self-closing": "true"
+          }
         },
-        "capabilitiesUrl": "https://catalogue-imos.aodn.org.au/geonetwork/srv/eng/csw?request=GetCapabilities&service=CSW&version=2.0.2",
-        "icon": "blank.png",
-        "rejectDuplicateResource": "false",
-        "hopCount": "2",
-        "xpathFilter": {},
-        "xslfilter": {},
-        "queryScope": "local",
-        "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0",
-        "sortBy": "identifier:A"
+        "rejectDuplicateResource": "false"
       },
-      "content": {
-        "validate": "NOVALIDATION",
-        "importxslt": "none",
-        "batchEdits": "[]"
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "csw",
+      "-id": "7951",
+      "ownerGroup": {
+        "name": "IMOS",
+        "id": "361"
       },
       "options": {
-        "every": "0 0 0 ? * *",
         "oneRunOnly": "true",
         "overrideUuid": "SKIP",
+        "every": "0 0 0 ? * *",
         "status": "inactive"
       },
+      "ifRecordExistAppendPrivileges": "false",
       "filters": {
         "filter": {
+          "condition": {
+            "-self-closing": "true"
+          },
           "field": "Category",
-          "operator": "EQUAL",
           "value": "imos-hosted-content",
-          "condition": {}
+          "operator": "EQUAL"
         }
       },
-      "privileges": {
-        "group": {
-          "-id": "1",
-          "operation": [
-            {
-              "-name": "view"
-            },
-            {
-              "-name": "dynamic"
-            },
-            {
-              "-name": "download"
-            }
-          ]
-        }
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": "[]"
       },
-      "ifRecordExistAppendPrivileges": "false",
       "info": {
-        "lastRun": "2024-02-29T02:36:05.642515Z",
         "running": "false",
         "result": {
-          "added": "736",
-          "atomicDatasetRecords": "0",
-          "badFormat": "0",
-          "collectionDatasetRecords": "0",
-          "datasetUuidExist": "0",
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "5",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "736",
           "privilegesAppendedOnExistingRecord": "0",
           "doesNotValidate": "0",
-          "xpathFilterExcluded": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
           "duplicatedResource": "0",
-          "fragmentsMatched": "0",
           "fragmentsReturned": "0",
-          "fragmentsUnknownSchema": "0",
-          "incompatible": "0",
           "recordsBuilt": "0",
-          "recordsUpdated": "0",
-          "removed": "0",
-          "serviceRecords": "0",
-          "subtemplatesAdded": "0",
-          "subtemplatesRemoved": "0",
-          "subtemplatesUpdated": "0",
-          "total": "736",
-          "unchanged": "0",
+          "unchanged": "723",
           "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
           "unretrievable": "0",
-          "updated": "0",
+          "datasetUuidExist": "1",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
           "thumbnails": "0",
-          "thumbnailsFailed": "0",
-          "errors": {}
-        }
+          "updated": "7",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T05:22:05.645629Z"
       }
     }
   }
diff --git a/geonetwork-config/harvesters/aims-imos.json b/geonetwork-config/harvesters/2_aims_nrs.json
similarity index 56%
rename from geonetwork-config/harvesters/aims-imos.json
rename to geonetwork-config/harvesters/2_aims_nrs.json
index 6fba421..f94f8c0 100644
--- a/geonetwork-config/harvesters/aims-imos.json
+++ b/geonetwork-config/harvesters/2_aims_nrs.json
@@ -1,51 +1,24 @@
 {
-  "name": "AIMS (IMOS content)",
-  "comments": "Migrate from RC geonetwork4",
+  "name": "2. AIMS NRS (IMOS content)",
+  "comments": "Migrate from Metatest config",
   "harvester_data": {
     "node": {
-      "-id": "308",
-      "-type": "oaipmh",
       "owner": {
         "id": "1"
       },
-      "ownerGroup": {
-        "id": "101",
-        "name": "IMOS"
-      },
-      "ownerUser": {
-        "id": "undefined"
-      },
-      "site": {
-        "name": "AIMS (IMOS content)",
-        "uuid": "4c3237e7-f07d-486d-862b-5a51783106b9",
-        "account": {
-          "use": "false",
-          "username": {},
-          "password": {}
-        },
-        "url": "https://data.aims.gov.au/metadata-oai/",
-        "icon": "AIMS_logo.gif",
-        "xslfilter": {}
-      },
-      "content": {
-        "validate": "NOVALIDATION",
-        "importxslt": "none",
-        "batchEdits": {}
-      },
-      "options": {
-        "every": "0 0 0 ? * *",
-        "oneRunOnly": "true",
-        "overrideUuid": "SKIP",
-        "status": "inactive",
-        "validate": "NOVALIDATION"
-      },
       "searches": {
         "search": {
-          "from": {},
-          "until": {},
+          "stylesheet": {
+            "-self-closing": "true"
+          },
           "set": "National Reference Stations",
           "prefix": "mdb",
-          "stylesheet": {}
+          "from": {
+            "-self-closing": "true"
+          },
+          "until": {
+            "-self-closing": "true"
+          }
         }
       },
       "privileges": {
@@ -53,51 +26,104 @@
           "-id": "1",
           "operation": [
             {
-              "-name": "view"
+              "-name": "view",
+              "-self-closing": "true"
             },
             {
-              "-name": "dynamic"
+              "-name": "dynamic",
+              "-self-closing": "true"
             },
             {
-              "-name": "download"
+              "-name": "download",
+              "-self-closing": "true"
             }
           ]
         }
       },
+      "site": {
+        "name": "2. AIMS NRS (IMOS content)",
+        "icon": "AIMS_logo.gif",
+        "uuid": "ed4111f7-a46b-4c43-adf1-263f4f1e30ef",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        },
+        "url": "https://data.aims.gov.au/metadata-oai/"
+      },
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "oaipmh",
+      "-id": "7764",
+      "ownerGroup": {
+        "name": "IMOS",
+        "id": "361"
+      },
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "every": "0 0 18 * * ?",
+        "status": "inactive",
+        "validate": "NOVALIDATION"
+      },
       "ifRecordExistAppendPrivileges": "false",
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": {
+          "-self-closing": "true"
+        }
+      },
       "info": {
-        "lastRun": "2024-03-26T03:49:24.706402Z",
         "running": "false",
         "result": {
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
           "added": "0",
-          "atomicDatasetRecords": "0",
-          "badFormat": "0",
-          "collectionDatasetRecords": "0",
-          "datasetUuidExist": "12",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "46",
           "privilegesAppendedOnExistingRecord": "0",
           "doesNotValidate": "0",
-          "xpathFilterExcluded": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
           "duplicatedResource": "0",
-          "fragmentsMatched": "0",
           "fragmentsReturned": "0",
-          "fragmentsUnknownSchema": "0",
-          "incompatible": "0",
           "recordsBuilt": "0",
-          "recordsUpdated": "0",
-          "removed": "0",
-          "serviceRecords": "0",
-          "subtemplatesAdded": "0",
-          "subtemplatesRemoved": "0",
-          "subtemplatesUpdated": "0",
-          "total": "46",
           "unchanged": "0",
           "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
           "unretrievable": "0",
-          "updated": "68",
+          "datasetUuidExist": "0",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
           "thumbnails": "0",
-          "thumbnailsFailed": "0",
-          "errors": {}
-        }
+          "updated": "92",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T08:00:00.012818Z"
       }
     }
   }
diff --git a/geonetwork-config/harvesters/3_csiro_hplc_pigment.json b/geonetwork-config/harvesters/3_csiro_hplc_pigment.json
new file mode 100644
index 0000000..7e30c6f
--- /dev/null
+++ b/geonetwork-config/harvesters/3_csiro_hplc_pigment.json
@@ -0,0 +1,130 @@
+{
+  "name": "3. CSIRO HPLC pigment (IMOS content)",
+  "comments": "Migrate from Metatest config",
+  "node": {
+    "harvester_data": {
+      "owner": {
+        "id": "1"
+      },
+      "privileges": {
+        "group": {
+          "-id": "1",
+          "operation": [
+            {
+              "-name": "view",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "dynamic",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "download",
+              "-self-closing": "true"
+            }
+          ]
+        }
+      },
+      "site": {
+        "xpathFilter": {
+          "-self-closing": "true"
+        },
+        "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0",
+        "queryScope": "local",
+        "hopCount": "2",
+        "name": "3. CSIRO HPLC pigment (IMOS content)",
+        "icon": "CSIRO_colour_logo.gif",
+        "capabilitiesUrl": "https://marlin.csiro.au/geonetwork/srv/eng/csw",
+        "sortBy": "identifier:A",
+        "uuid": "e57aee16-8943-4d02-b5f5-fc58f5d3f5d3",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        },
+        "rejectDuplicateResource": "false"
+      },
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "csw",
+      "-id": "7999",
+      "ownerGroup": {
+        "name": "IMOS",
+        "id": "361"
+      },
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "every": "0 30 17 * * ?",
+        "status": "inactive"
+      },
+      "ifRecordExistAppendPrivileges": "false",
+      "filters": {
+        "filter": {
+          "condition": {
+            "-self-closing": "true"
+          },
+          "field": "Title",
+          "value": "HPLC pigment",
+          "operator": "EQUAL"
+        }
+      },
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": "[]"
+      },
+      "info": {
+        "running": "false",
+        "result": {
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "0",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "68",
+          "privilegesAppendedOnExistingRecord": "0",
+          "doesNotValidate": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
+          "duplicatedResource": "0",
+          "fragmentsReturned": "0",
+          "recordsBuilt": "0",
+          "unchanged": "68",
+          "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
+          "unretrievable": "0",
+          "datasetUuidExist": "0",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
+          "thumbnails": "0",
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T07:30:00.017299Z"
+      }
+    }
+  }
+}
diff --git a/geonetwork-config/harvesters/imos-catalogue.json b/geonetwork-config/harvesters/4_aad.json
similarity index 55%
rename from geonetwork-config/harvesters/imos-catalogue.json
rename to geonetwork-config/harvesters/4_aad.json
index e7586c2..8932577 100644
--- a/geonetwork-config/harvesters/imos-catalogue.json
+++ b/geonetwork-config/harvesters/4_aad.json
@@ -1,107 +1,113 @@
 {
-  "name": "IMOS catalogue (currently doesn't exclude harvested content)",
-  "comments": "Migrate from RC geonetwork4",
+  "name": "4. AAD",
+  "comments": "Migrate from Metatest config",
   "harvester_data": {
     "node": {
-      "-id": "193",
-      "-type": "csw",
       "owner": {
         "id": "1"
       },
-      "ownerGroup": {
-        "id": "2",
-        "name": "Sample group"
-      },
-      "ownerUser": {
-        "id": "undefined"
-      },
-      "site": {
-        "name": "IMOS catalogue (currently doesn't exclude harvested content)",
-        "uuid": "d56fb88e-6754-47dc-9daa-f0c40db4a9f3",
-        "account": {
-          "use": "false",
-          "username": {},
-          "password": {}
-        },
-        "capabilitiesUrl": "https://catalogue-imos.aodn.org.au/geonetwork/srv/eng/csw?request=GetCapabilities&service=CSW&version=2.0.2",
-        "icon": "IMOS_color_logo.gif",
-        "rejectDuplicateResource": "false",
-        "hopCount": "2",
-        "xpathFilter": {},
-        "xslfilter": {},
-        "queryScope": "local",
-        "outputSchema": "http://www.isotc211.org/2005/gmd",
-        "sortBy": "identifier:A"
-      },
-      "content": {
-        "validate": "NOVALIDATION",
-        "importxslt": "none",
-        "batchEdits": "[]"
-      },
-      "options": {
-        "every": "0 0 0 ? * *",
-        "oneRunOnly": "true",
-        "overrideUuid": "SKIP",
-        "status": "inactive"
-      },
-      "filters": {
-        "filter": {
-          "field": "MetadataPointOfContact",
-          "operator": "LIKE",
-          "value": "%Data%",
-          "condition": {}
-        }
-      },
       "privileges": {
         "group": {
           "-id": "1",
           "operation": [
             {
-              "-name": "view"
+              "-name": "view",
+              "-self-closing": "true"
             },
             {
-              "-name": "dynamic"
+              "-name": "dynamic",
+              "-self-closing": "true"
             },
             {
-              "-name": "download"
+              "-name": "download",
+              "-self-closing": "true"
             }
           ]
         }
       },
+      "site": {
+        "name": "4. AAD",
+        "icon": "AAD_logo.gif",
+        "uuid": "a9af62c0-15ea-44db-824d-e33de52b72d5",
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        },
+        "url": "https://data.aad.gov.au/metadata/api/waf/iso-19115-1-mcp/"
+      },
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "webdav",
+      "-id": "8409",
+      "ownerGroup": {
+        "name": "Australian_Antarctic_Division",
+        "id": "245"
+      },
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "subtype": "waf",
+        "recurse": "true",
+        "every": "0 45 23 * * ?",
+        "status": "inactive",
+        "validate": "NOVALIDATION"
+      },
       "ifRecordExistAppendPrivileges": "false",
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": {
+          "-self-closing": "true"
+        }
+      },
       "info": {
-        "lastRun": "2024-03-08T00:00:00.049986Z",
         "running": "false",
         "result": {
-          "added": "0",
-          "atomicDatasetRecords": "0",
-          "badFormat": "0",
-          "collectionDatasetRecords": "0",
-          "datasetUuidExist": "0",
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "1771",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "1771",
           "privilegesAppendedOnExistingRecord": "0",
           "doesNotValidate": "0",
-          "xpathFilterExcluded": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
           "duplicatedResource": "0",
-          "fragmentsMatched": "0",
           "fragmentsReturned": "0",
-          "fragmentsUnknownSchema": "0",
-          "incompatible": "0",
           "recordsBuilt": "0",
-          "recordsUpdated": "0",
-          "removed": "0",
-          "serviceRecords": "0",
-          "subtemplatesAdded": "0",
-          "subtemplatesRemoved": "0",
-          "subtemplatesUpdated": "0",
-          "total": "0",
           "unchanged": "0",
           "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
           "unretrievable": "0",
-          "updated": "0",
+          "datasetUuidExist": "0",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
           "thumbnails": "0",
-          "thumbnailsFailed": "0",
-          "errors": {}
-        }
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T01:31:53.072375Z"
       }
     }
   }
diff --git a/geonetwork-config/harvesters/5_aims.json b/geonetwork-config/harvesters/5_aims.json
new file mode 100644
index 0000000..b118cff
--- /dev/null
+++ b/geonetwork-config/harvesters/5_aims.json
@@ -0,0 +1,152 @@
+{
+  "name": "5. AIMS",
+  "comments": "Migrate from Metatest config",
+  "harvester_data": {
+    "node": {
+      "owner": {
+        "id": "1"
+      },
+      "searches": {
+        "search": {
+          "digital": "false",
+          "keywords": {
+            "-self-closing": "true"
+          },
+          "anyValue": {
+            "-self-closing": "true"
+          },
+          "freeText": {
+            "-self-closing": "true"
+          },
+          "abstract": {
+            "-self-closing": "true"
+          },
+          "anyField": {
+            "-self-closing": "true"
+          },
+          "source": {
+            "name": {
+              "-self-closing": "true"
+            },
+            "uuid": {
+              "-self-closing": "true"
+            }
+          },
+          "title": {
+            "-self-closing": "true"
+          },
+          "hardcopy": "false"
+        }
+      },
+      "privileges": {
+        "group": {
+          "-id": "1",
+          "operation": [
+            {
+              "-name": "view",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "dynamic",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "download",
+              "-self-closing": "true"
+            }
+          ]
+        }
+      },
+      "-id": "8767",
+      "ownerGroup": {
+        "name": "AIMS",
+        "id": "242"
+      },
+      "groupsCopyPolicy": {
+        "-self-closing": "true"
+      },
+      "ifRecordExistAppendPrivileges": "false",
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": {
+          "-self-closing": "true"
+        }
+      },
+      "site": {
+        "node": "srv",
+        "mefFormatFull": "false",
+        "useChangeDateForUpdate": "false",
+        "createRemoteCategory": "false",
+        "name": "5. AIMS",
+        "host": "https://geonetwork.apps.aims.gov.au/geonetwork",
+        "uuid": "2953a624-44fb-428b-b395-99af12c58276",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        }
+      },
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "geonetwork",
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "every": "0 0 2 ? * 7",
+        "status": "inactive"
+      },
+      "info": {
+        "running": "false",
+        "result": {
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "2389",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "2436",
+          "privilegesAppendedOnExistingRecord": "0",
+          "doesNotValidate": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
+          "duplicatedResource": "0",
+          "fragmentsReturned": "0",
+          "recordsBuilt": "0",
+          "unchanged": "0",
+          "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
+          "unretrievable": "0",
+          "datasetUuidExist": "47",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
+          "thumbnails": "0",
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T05:36:50.907593Z"
+      }
+    }
+  }
+}
diff --git a/geonetwork-config/harvesters/6_csiro_ocean_atmosphere.json b/geonetwork-config/harvesters/6_csiro_ocean_atmosphere.json
new file mode 100644
index 0000000..efab958
--- /dev/null
+++ b/geonetwork-config/harvesters/6_csiro_ocean_atmosphere.json
@@ -0,0 +1,122 @@
+{
+  "name": "6. CSIRO - Oceans and Atmosphere",
+  "comments": "Migrate from Metatest config",
+  "harvester_data": {
+    "node": {
+      "owner": {
+        "id": "1"
+      },
+      "privileges": {
+        "group": {
+          "-id": "1",
+          "operation": [
+            {
+              "-name": "view",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "dynamic",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "download",
+              "-self-closing": "true"
+            }
+          ]
+        }
+      },
+      "site": {
+        "xpathFilter": {
+          "-self-closing": "true"
+        },
+        "outputSchema": "http://www.isotc211.org/2005/gmd",
+        "queryScope": "local",
+        "hopCount": "2",
+        "name": "6. CSIRO - Oceans and Atmosphere",
+        "icon": "CSIRO_colour_logo.gif",
+        "capabilitiesUrl": "https://marlin.csiro.au/geonetwork/srv/eng/csw",
+        "sortBy": "identifier:A",
+        "uuid": "3ff49847-4b01-41eb-bc52-a905e4a2b827",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        },
+        "rejectDuplicateResource": "false"
+      },
+      "ownerUser": {
+        "id": {
+          "-self-closing": "true"
+        }
+      },
+      "-type": "csw",
+      "-id": "8816",
+      "ownerGroup": {
+        "name": "CSIRO Oceans and Atmosphere",
+        "id": "341"
+      },
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "every": "0 0 20 * * ?",
+        "status": "inactive"
+      },
+      "ifRecordExistAppendPrivileges": "false",
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": "[]"
+      },
+      "info": {
+        "running": "false",
+        "result": {
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "4328",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "4406",
+          "privilegesAppendedOnExistingRecord": "0",
+          "doesNotValidate": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
+          "duplicatedResource": "0",
+          "fragmentsReturned": "0",
+          "recordsBuilt": "0",
+          "unchanged": "0",
+          "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
+          "unretrievable": "0",
+          "datasetUuidExist": "78",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
+          "thumbnails": "0",
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T05:58:34.4571Z"
+      }
+    }
+  }
+}
diff --git a/geonetwork-config/harvesters/imos.json b/geonetwork-config/harvesters/7_imas.json
similarity index 50%
rename from geonetwork-config/harvesters/imos.json
rename to geonetwork-config/harvesters/7_imas.json
index a5a2e5e..27f397d 100644
--- a/geonetwork-config/harvesters/imos.json
+++ b/geonetwork-config/harvesters/7_imas.json
@@ -1,61 +1,41 @@
 {
-  "name": "IMOS (currently doesn't exclude harvested content)",
-  "comments": "Migrate from RC geonetwork4",
+  "name": "7. IMAS",
+  "comments": "Migrate from Metatest config",
   "harvester_data": {
     "node": {
-      "-id": "506",
-      "-type": "geonetwork",
       "owner": {
         "id": "1"
       },
-      "ownerGroup": {
-        "id": "101",
-        "name": "IMOS"
-      },
-      "ownerUser": {
-        "id": "undefined"
-      },
-      "site": {
-        "name": "IMOS (currently doesn't exclude harvested content)",
-        "uuid": "a83c5159-61cf-40e5-b47a-b6215a738f30",
-        "icon": "IMOS_color_logo.gif",
-        "account": {
-          "use": "false",
-          "username": {},
-          "password": {}
-        },
-        "host": "https://catalogue-imos.aodn.org.au/geonetwork",
-        "node": "srv",
-        "useChangeDateForUpdate": "false",
-        "createRemoteCategory": "false",
-        "mefFormatFull": "false",
-        "xslfilter": {}
-      },
-      "content": {
-        "validate": "NOVALIDATION",
-        "importxslt": "none",
-        "batchEdits": {}
-      },
-      "options": {
-        "every": "0 0 0 ? * *",
-        "oneRunOnly": "true",
-        "overrideUuid": "SKIP",
-        "status": "inactive"
-      },
       "searches": {
         "search": {
-          "freeText": {},
-          "title": {},
-          "abstract": {},
-          "keywords": {},
           "digital": "false",
-          "hardcopy": "false",
-          "anyField": {},
-          "anyValue": {},
+          "keywords": {
+            "-self-closing": "true"
+          },
+          "anyValue": {
+            "-self-closing": "true"
+          },
+          "freeText": {
+            "-self-closing": "true"
+          },
+          "abstract": {
+            "-self-closing": "true"
+          },
+          "anyField": {
+            "-self-closing": "true"
+          },
           "source": {
-            "uuid": {},
-            "name": {}
-          }
+            "name": {
+              "-self-closing": "true"
+            },
+            "uuid": {
+              "-self-closing": "true"
+            }
+          },
+          "title": {
+            "-self-closing": "true"
+          },
+          "hardcopy": "false"
         }
       },
       "privileges": {
@@ -63,52 +43,109 @@
           "-id": "1",
           "operation": [
             {
-              "-name": "view"
+              "-name": "view",
+              "-self-closing": "true"
             },
             {
-              "-name": "dynamic"
+              "-name": "dynamic",
+              "-self-closing": "true"
             },
             {
-              "-name": "download"
+              "-name": "download",
+              "-self-closing": "true"
             }
           ]
         }
       },
+      "-id": "9165",
+      "ownerGroup": {
+        "name": "IMAS",
+        "id": "360"
+      },
+      "groupsCopyPolicy": {
+        "-self-closing": "true"
+      },
       "ifRecordExistAppendPrivileges": "false",
-      "groupsCopyPolicy": {},
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": {
+          "-self-closing": "true"
+        }
+      },
+      "site": {
+        "node": "srv",
+        "mefFormatFull": "false",
+        "useChangeDateForUpdate": "false",
+        "createRemoteCategory": "false",
+        "name": "7. IMAS",
+        "host": "http://metadata.imas.utas.edu.au/geonetwork",
+        "uuid": "0a290e50-4290-4072-b480-06c69cbccd50",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
+        "account": {
+          "password": {
+            "-self-closing": "true"
+          },
+          "use": "false",
+          "username": {
+            "-self-closing": "true"
+          }
+        }
+      },
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "geonetwork",
+      "options": {
+        "oneRunOnly": "true",
+        "overrideUuid": "SKIP",
+        "every": "0 0 18 ? * 2-6",
+        "status": "inactive"
+      },
       "info": {
-        "lastRun": "2024-03-08T00:00:00.050285Z",
         "running": "false",
         "result": {
-          "added": "922",
-          "atomicDatasetRecords": "0",
-          "badFormat": "0",
-          "collectionDatasetRecords": "0",
-          "datasetUuidExist": "770",
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
+          "added": "846",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "858",
           "privilegesAppendedOnExistingRecord": "0",
           "doesNotValidate": "0",
-          "xpathFilterExcluded": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
           "duplicatedResource": "0",
-          "fragmentsMatched": "0",
           "fragmentsReturned": "0",
-          "fragmentsUnknownSchema": "0",
-          "incompatible": "0",
           "recordsBuilt": "0",
-          "recordsUpdated": "0",
-          "removed": "0",
-          "serviceRecords": "0",
-          "subtemplatesAdded": "0",
-          "subtemplatesRemoved": "0",
-          "subtemplatesUpdated": "0",
-          "total": "1692",
           "unchanged": "0",
           "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
           "unretrievable": "0",
-          "updated": "0",
+          "datasetUuidExist": "12",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
           "thumbnails": "0",
-          "thumbnailsFailed": "0",
-          "errors": {}
-        }
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T23:45:38.556115Z"
       }
     }
   }
diff --git a/geonetwork-config/harvesters/ga-marine.json b/geonetwork-config/harvesters/8_ga-marine.json
similarity index 63%
rename from geonetwork-config/harvesters/ga-marine.json
rename to geonetwork-config/harvesters/8_ga-marine.json
index 4d920a8..1293d31 100644
--- a/geonetwork-config/harvesters/ga-marine.json
+++ b/geonetwork-config/harvesters/8_ga-marine.json
@@ -1,106 +1,129 @@
 {
-  "name": "GA - Marine",
+  "name": "8. GA - Marine",
   "comments": "Migrate from RC geonetwork4",
   "harvester_data": {
     "node": {
-      "-id": "347",
-      "-type": "csw",
       "owner": {
         "id": "1"
       },
-      "ownerGroup": {
-        "id": "2",
-        "name": "Sample group"
-      },
-      "ownerUser": {
-        "id": "undefined"
+      "privileges": {
+        "group": {
+          "-id": "1",
+          "operation": [
+            {
+              "-name": "view",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "dynamic",
+              "-self-closing": "true"
+            },
+            {
+              "-name": "download",
+              "-self-closing": "true"
+            }
+          ]
+        }
       },
       "site": {
-        "name": "GA - Marine",
-        "uuid": "fc05bf66-d433-4cfa-86ef-358f9aec01cd",
+        "xpathFilter": {
+          "-self-closing": "true"
+        },
+        "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0",
+        "queryScope": "local",
+        "hopCount": "2",
+        "name": "8. GA - Marine",
+        "icon": "GA_logo.gif",
+        "capabilitiesUrl": "https://ecat.ga.gov.au/geonetwork/srv/eng/csw?service=CSW&request=GetCapabilities&acceptVersions=2.0.2",
+        "sortBy": "identifier:A",
+        "uuid": "240e40c4-c6da-4744-80ee-c4c4381db4bc",
+        "xslfilter": {
+          "-self-closing": "true"
+        },
         "account": {
+          "password": {
+            "-self-closing": "true"
+          },
           "use": "false",
-          "username": {},
-          "password": {}
+          "username": {
+            "-self-closing": "true"
+          }
         },
-        "capabilitiesUrl": "https://ecat.ga.gov.au/geonetwork/srv/eng/csw?service=CSW&request=GetCapabilities&acceptVersions=2.0.2",
-        "icon": "GA_logo.gif",
-        "rejectDuplicateResource": "false",
-        "hopCount": "2",
-        "xpathFilter": {},
-        "xslfilter": {},
-        "queryScope": "local",
-        "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0",
-        "sortBy": "identifier:A"
+        "rejectDuplicateResource": "false"
       },
-      "content": {
-        "validate": "NOVALIDATION",
-        "importxslt": "none",
-        "batchEdits": "[]"
+      "ownerUser": {
+        "id": "undefined"
+      },
+      "-type": "csw",
+      "-id": "7806",
+      "ownerGroup": {
+        "name": "sample",
+        "id": "2"
       },
       "options": {
-        "every": "0 0 0 ? * *",
         "oneRunOnly": "true",
         "overrideUuid": "SKIP",
+        "every": "0 0 18 * * ?",
         "status": "inactive"
       },
+      "ifRecordExistAppendPrivileges": "false",
       "filters": {
         "filter": {
+          "condition": {
+            "-self-closing": "true"
+          },
           "field": "Subject",
-          "operator": "LIKE",
           "value": "%Marine%",
-          "condition": {}
+          "operator": "LIKE"
         }
       },
-      "privileges": {
-        "group": {
-          "-id": "1",
-          "operation": [
-            {
-              "-name": "view"
-            },
-            {
-              "-name": "dynamic"
-            },
-            {
-              "-name": "download"
-            }
-          ]
-        }
+      "content": {
+        "translateContent": "false",
+        "importxslt": "none",
+        "translateContentFields": {
+          "-self-closing": "true"
+        },
+        "translateContentLangs": {
+          "-self-closing": "true"
+        },
+        "validate": "NOVALIDATION",
+        "batchEdits": "[]"
       },
-      "ifRecordExistAppendPrivileges": "false",
       "info": {
-        "lastRun": "2024-04-04T02:03:50.245891Z",
         "running": "false",
         "result": {
+          "fragmentsMatched": "0",
+          "fragmentsUnknownSchema": "0",
           "added": "0",
-          "atomicDatasetRecords": "0",
-          "badFormat": "0",
-          "collectionDatasetRecords": "0",
-          "datasetUuidExist": "0",
+          "serviceRecords": "0",
+          "incompatible": "0",
+          "thumbnailsFailed": "0",
+          "total": "0",
           "privilegesAppendedOnExistingRecord": "0",
           "doesNotValidate": "0",
-          "xpathFilterExcluded": "0",
+          "subtemplatesRemoved": "0",
+          "badFormat": "0",
+          "subtemplatesAdded": "0",
           "duplicatedResource": "0",
-          "fragmentsMatched": "0",
           "fragmentsReturned": "0",
-          "fragmentsUnknownSchema": "0",
-          "incompatible": "0",
           "recordsBuilt": "0",
-          "recordsUpdated": "0",
-          "removed": "0",
-          "serviceRecords": "0",
-          "subtemplatesAdded": "0",
-          "subtemplatesRemoved": "0",
-          "subtemplatesUpdated": "0",
-          "total": "0",
           "unchanged": "0",
           "unknownSchema": "0",
+          "subtemplatesUpdated": "0",
           "unretrievable": "0",
-          "updated": "0",
+          "datasetUuidExist": "0",
+          "atomicDatasetRecords": "0",
+          "recordsUpdated": "0",
+          "removed": "0",
+          "xpathFilterExcluded": "0",
+          "collectionDatasetRecords": "0",
           "thumbnails": "0",
-          "thumbnailsFailed": "0"
-        }
+          "updated": "0",
+          "errors": {
+            "-self-closing": "true"
+          }
+        },
+        "lastRun": "2024-08-05T08:00:00.012579Z"
       }
     }
   }
diff --git a/geonetwork-config/harvesters/portal_catalogue_nesp_aodn_portal.json b/geonetwork-config/harvesters/portal_catalogue_nesp_aodn_portal.json
deleted file mode 100644
index 14ef837..0000000
--- a/geonetwork-config/harvesters/portal_catalogue_nesp_aodn_portal.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "name": "External - IMAS: AODN Portal NESP",
-    "harvester_data": {
-        "node": {
-            "@type": "csw",
-            "site": {
-                "name": "External - IMAS: AODN Portal NESP",
-                "account": {
-                    "use": "false",
-                    "username": { },
-                    "password": { }
-                },
-                "capabilitiesUrl": "http://metadata.imas.utas.edu.au/geonetwork/srv/eng/csw-AODN-Portal-NESP?request=GetCapabilities&service=CSW&acceptVersions=2.0.2",
-                "icon": "NESP_logo.png",
-                "xslfilter": "portal-linkage-updater",
-                "outputSchema": "http://standards.iso.org/iso/19115/-3/mdb/2.0"
-            },
-            "content": {
-                "validate": "false",
-                "importxslt": "none"
-            },
-            "options": {
-                "every": "0 45 23 ? * *",
-                "oneRunOnly": "false",
-                "status": "active"
-            },
-            "searches": {
-                "search": {
-                    "CreationDate":{ "value": null },
-                    "GeographicDescriptionCode":{ "value":null },
-                    "OperatesOn":{ "value":null },
-                    "Modified":{ "value":null },
-                    "DistanceUOM":{ "value":null },
-                    "Operation":{ "value":null },
-                    "ResourceIdentifier":{ "value":null },
-                    "Format":{ "value":null },
-                    "Identifier":{ "value":null },
-                    "Language":{ "value":null },
-                    "ServiceType":{ "value":null },
-                    "OrganisationName":{ "value":null },
-                    "KeywordType":{ "value":null },
-                    "AnyText": { "value": null },
-                    "PublicationDate":{ "value":null },
-                    "AlternateTitle":{ "value":null },
-                    "Abstract":{ "value":null },
-                    "HasSecurityConstraints":{ "value":null },
-                    "Title":{ "value":null },
-                    "CouplingType":{ "value":null },
-                    "TopicCategory":{ "value":null },
-                    "ParentIdentifier":{ "value":null },
-                    "Subject":{ "value":null },
-                    "ResourceLanguage":{ "value":null },
-                    "TempExtent_end":{ "value":null },
-                    "ServiceTypeVersion":{ "value":null },
-                    "Type":{ "value":null },
-                    "RevisionDate":{ "value":null },
-                    "OperatesOnName":{ "value":null },
-                    "Denominator":{ "value":null },
-                    "DistanceValue":{ "value":null },
-                    "TempExtent_begin":{ "value":null },
-                    "OperatesOnIdentifier":{ "value":null },
-                    "SpecificationDate":{ "value":null },
-                    "AccessConstraints":{ "value":null },
-                    "ResponsiblePartyRole":{ "value":null },
-                    "Degree":{ "value":null },
-                    "Lineage":{ "value":null },
-                    "OnlineResourceMimeType":{ "value":null },
-                    "ConditionApplyingToAccessAndUse":{ "value":null },
-                    "Date":{ "value":null },
-                    "MetadataPointOfContact":{ "value":null },
-                    "OnlineResourceType":{ "value":null },
-                    "Relation":{ "value":null },
-                    "SpecificationDateType":{ "value":null },
-                    "Classification":{ "value":null },
-                    "OtherConstraints":{ "value":null },
-                    "SpecificationTitle":{ "value":null },
-                    "bbox-xmin":{ "value":null },
-                    "bbox-ymin":{ "value":null },
-                    "bbox-xmax":{ "value":null },
-                    "bbox-ymax":{ "value":null }
-                }
-            },
-            "privileges": {
-                "group": {
-                    "@id": "1",
-                    "operation": [
-                        {
-                            "@name": "view"
-                        },
-                        {
-                            "@name": "dynamic"
-                        },
-                        {
-                            "@name": "featured"
-                        }
-                    ]
-                }
-            }
-        }
-    }
-}