diff --git a/cssa/machinetag.json b/cssa/machinetag.json
index dca40ec..d931e4a 100644
--- a/cssa/machinetag.json
+++ b/cssa/machinetag.json
@@ -7,14 +7,14 @@
       "value": "sharing-class",
       "expanded": "Sharing Class"
     },
-    {
-      "value": "origin",
-      "expanded": "Origin"
-    },
     {
       "value": "report",
       "expanded": "Report"
     },
+    {
+      "value": "origin",
+      "expanded": "Origin"
+    },
     {
       "value": "analyse",
       "expanded": "Please analyse sample",
diff --git a/gea-nz-motivators/machinetag.json b/gea-nz-motivators/machinetag.json
index 7a4cadb..8ec43c5 100644
--- a/gea-nz-motivators/machinetag.json
+++ b/gea-nz-motivators/machinetag.json
@@ -71,10 +71,6 @@
       "expanded": "Controls Security",
       "description": "Information about the constraints security places on interactions within and across the government, agencies and 3th parties."
     },
-    {
-      "value": "controls-risk-governance",
-      "expanded": "Controls Risk Governance"
-    },
     {
       "value": "contracts-arrangement",
       "expanded": "Contracts Arrangement",
@@ -94,6 +90,10 @@
       "value": "contracts-jurisdiction",
       "expanded": "Contracts Jurisdicrion",
       "description": "nformation about political and geographical areas in which an organisation operates."
+    },
+    {
+      "value": "controls-risk-governance",
+      "expanded": "Controls Risk Governance"
     }
   ],
   "values": [
diff --git a/misp/machinetag.json b/misp/machinetag.json
index e918764..96675bf 100644
--- a/misp/machinetag.json
+++ b/misp/machinetag.json
@@ -184,10 +184,6 @@
       "expanded": "API related tag influencing the MISP behavior of the API.",
       "value": "api"
     },
-    {
-      "expanded": "IDS related tag unfluencing the MISP behavior of the IDS flag.",
-      "value": "ids"
-    },
     {
       "description": "Expansion tag incluencing the MISP behavior using expansion modules",
       "expanded": "Expansion",
@@ -226,6 +222,10 @@
       "expanded": "misp2yara export tool",
       "value": "misp2yara",
       "exclusive": true
+    },
+    {
+      "expanded": "IDS related tag unfluencing the MISP behavior of the IDS flag.",
+      "value": "ids"
     }
   ],
   "version": 11,