diff --git a/config/search/config.json b/config/search/config.json
index bfb99e0..6649ae8 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -141,8 +141,8 @@
     {
       "type": "mandatory",
       "on_path": "mandatories",
-      "rdf_type": "http://data.vlaanderen.be/ns/mandaat#Mandataris",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.vlaanderen.be/ns/mandaat#Mandataris",
         "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris"
       ],
       "properties": {
@@ -150,11 +150,11 @@
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -312,11 +312,11 @@
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -468,8 +468,8 @@
     {
       "type": "minister",
       "on_path": "ministers",
-      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
         "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
       ],
       "properties": {
@@ -477,11 +477,11 @@
           "http://www.w3.org/ns/org#heldBy",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -546,7 +546,7 @@
               }
             }
           },
-          "id": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
@@ -638,11 +638,11 @@
           }
         },
         {
-          "name": "id",
+          "name": "person_id",
           "mappings": {
-            "minister": "id",
-            "agent": "id",
-            "mandatory": "id"
+            "minister": "person_id",
+            "agent": "person_id",
+            "mandatory": "person_id"
           }
         },
         {
@@ -814,8 +814,8 @@
     {
       "type": "unit",
       "on_path": "units",
-      "rdf_type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
         "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid",
         "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst",
         "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst"
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index 97a230f..153ec14 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -1,7 +1,7 @@
 {
   "automatic_index_updates": true,
   "persist_indexes": true,
-  "number_of_threads": 11,
+  "number_of_threads": 8,
   "eager_indexing_groups": [
     [
       {
@@ -46,27 +46,27 @@
       }
     ]
   ],
-  "default_settings" : {
+  "default_settings": {
     "analysis": {
       "normalizer": {
         "custom_sort_normalizer": {
-            "type": "custom",
-            "char_filter": [],
-            "filter": [
-                "lowercase",
-                "trim",
-                "asciifolding"
-            ]
+          "type": "custom",
+          "char_filter": [],
+          "filter": [
+            "lowercase",
+            "trim",
+            "asciifolding"
+          ]
         }
-    }
+      }
     }
   },
   "types": [
     {
       "type": "mandatory",
       "on_path": "mandatories",
-      "rdf_type": "http://data.vlaanderen.be/ns/mandaat#Mandataris",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.vlaanderen.be/ns/mandaat#Mandataris",
         "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris"
       ],
       "properties": {
@@ -74,11 +74,11 @@
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -153,7 +153,7 @@
               }
             }
           },
-          "id": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
@@ -236,11 +236,11 @@
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -315,7 +315,7 @@
               }
             }
           },
-          "id": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
@@ -392,8 +392,8 @@
     {
       "type": "minister",
       "on_path": "ministers",
-      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
         "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
       ],
       "properties": {
@@ -401,11 +401,11 @@
           "http://www.w3.org/ns/org#heldBy",
           "http://xmlns.com/foaf/0.1/givenName"
         ],
-        "id": [
+        "person_id": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "uuid": [
+        "person_uuid": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
@@ -470,7 +470,7 @@
               }
             }
           },
-          "id": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
@@ -562,11 +562,11 @@
           }
         },
         {
-          "name": "id",
+          "name": "person_id",
           "mappings": {
-            "minister": "id",
-            "agent": "id",
-            "mandatory": "id"
+            "minister": "person_id",
+            "agent": "person_id",
+            "mandatory": "person_id"
           }
         },
         {
@@ -661,7 +661,7 @@
               }
             }
           },
-          "id": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
@@ -739,8 +739,8 @@
     {
       "type": "unit",
       "on_path": "units",
-      "rdf_type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
-      "sub_types": [
+      "rdf_type": [
+        "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
         "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid",
         "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst",
         "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst"
diff --git a/docker-compose.yml b/docker-compose.yml
index 62232c0..4a58160 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -466,10 +466,10 @@ services:
   ################################################################################
 
   ################################################################################
-  # MU SEARCH - TODO USE THE CORRECT IMAGE ONCE INHERITANCE IS IN MU SEARCH
+  # MU SEARCH 
   ################################################################################
   search:
-    image: nbittich/mu-search:wip-inheritance-alpha2 # Bump to fixed version when merged and release to the original repo
+    image: semtech/mu-search:0.9.0-beta.1 
     links:
       - db:database
     restart: always