diff --git a/address-kit-conf.json b/address-kit-conf.json
new file mode 100644
index 0000000..a005851
--- /dev/null
+++ b/address-kit-conf.json
@@ -0,0 +1,23 @@
+{
+    "environnement": {
+        "EZS_TITLE": "address-kit",
+        "EZS_DESCRIPTION": "Web service for affiliations",
+        "EZS_METRICS": true,
+        "EZS_CONCURRENCY": 2,
+        "EZS_NSHARDS": 32,
+        "EZS_CACHE": true,
+        "NODE_OPTIONS": "--max_old_space_size=1024",
+        "NODE_ENV": "production",
+        "PIP_NO_DEPENDENCIES": 0,
+        "PIP_DISABLE_PIP_VERSION_CHECK": 1,
+        "PIP_NO_CACHE_DIR": 0
+    },
+    "packages": [
+        "@ezs/core@3.0.6",
+        "@ezs/spawn@1.4.5",
+        "@ezs/basics@2.5.4"
+    ],
+    "files": {
+        "zip": "https://gitbucket.inist.fr/tdm/web-services/archive/address-kit/address-kit@2.0.3.zip"
+    }
+}
\ No newline at end of file
diff --git a/address-kit/README.md b/address-kit/README.md
index faa85c0..9594984 100644
--- a/address-kit/README.md
+++ b/address-kit/README.md
@@ -2,7 +2,13 @@
 
 Cette instance propose des outils de traitement d'adresses
 
+## Configuration
 
+Voir le [fichier de configuration](../address-kit-conf.json).
+
+> ⚠ L'application à utiliser **doit** être un *worker* avec python version 3.9.  
+> À l'heure de l'écriture de cette documentation, c'est
+> `inistcnrs/lodex-workers-python@4.0.11` qui est le plus adapté.  
 
 ## Utilisation
 
@@ -15,8 +21,6 @@
 Prend en entrée du JSON avec deux champs: `id` et `value`, et renvoie un JSON
 avec le code langue dans le champ `value`.
 
-
-
 #### Paramètres de v1/cnrsunit/cnrsunit
 
 | nom    | description                                                            |
@@ -47,8 +51,7 @@
 }]
 ```
 
-
-### V1/affiliationcountry/detect_country
+### V1/affiliationcountry/affiliationcountry
 
 Ce service permet à partir d'une adresse de déteminer le pays même s'il n'est pas dans l'adresse
 
@@ -58,7 +61,7 @@
 #### Exemple
 
 ```bash
-cat <<EOF | curl -X POST --data-binary @- "https://address-kit.services.inist.fr/v1/affiliationcountry/detect_country"
+cat <<EOF | curl -X POST --data-binary @- "https://address-kit.services.inist.fr/v1/affiliationcountry/affiliationcountry"
 
 [{"id":1, "value":"université sciences et technologies bordeaux 1 institut national de physique nucléaire et de physique des particules du cnrs in2p3 UMR5797"},
 {"id":2, "value":"auf der morgenstelle 8, 72076 tuebingen"}]
@@ -83,4 +86,4 @@
         "DEU"
     ]
 }]
-```
\ No newline at end of file
+```
diff --git a/address-kit/examples.http b/address-kit/examples.http
index 2a10e69..352d3d5 100644
--- a/address-kit/examples.http
+++ b/address-kit/examples.http
@@ -1,7 +1,15 @@
-# These examples can be used directly in VSCode, using REST Client extension (humao.rest-client)
+# These examples can be used directly in VSCode, using REST Client extension
+# (humao.rest-client) or httpYac (anweber.vscode-httpyac)
 
-# Informations sur une adresse cnrs
-POST https://address-kit.services.inist.fr/v1/cnrsunit/cnrsunit?indent=true HTTP/1.1
+# To test locally, replace with
+#@host = http://localhost:31976
+@host = https://address-kit.services.inist.fr
+#@host = http://address-kit.tdmservices.intra.inist.fr
+
+###
+# @name v1Cnrsunit
+# @description Informations sur une adresse cnrs
+POST {{host}}/v1/cnrsunit/cnrsunit?indent=true HTTP/1.1
 Content-Type: application/json
 
 [
@@ -11,9 +19,10 @@
 {"id":4,"value":"umr_d161 institut de recherche pour le développement ird um34 aix marseille université amu umr7330 collège de france cdf institution institut national des sciences de l'univers insu cnrs umr7330 centre national de la recherche scientifique cnrs umr1410 institut national de recherche pour l'agriculture l'alimentation et l'environnement inrae centre européen de recherche et d'enseignement des géosciences de l'environnement cerege europôle méditerranéen de l'arbois"}
 ]
 
-
-# détection d'un pays
-POST https://address-kit.services.inist.fr/v1/affiliationcountry/detect_country?indent=true HTTP/1.1
+###
+# @name v1Affiliationcountry
+# @description détection d'un pays
+POST {{host}}/v1/affiliationcountry/affilcountry?indent=true HTTP/1.1
 Content-Type: application/json
 
 [
@@ -26,3 +35,5 @@
 {"id":7,"value":"campus romanus de maron"}  ,
 {"id":8,"value":"Inist-CNRS, vandoeuvre les Nancy, France"}
 ]
+
+###
\ No newline at end of file
diff --git a/address-kit/requirements.txt b/address-kit/requirements.txt
index d8dab68..fbbbc5e 100644
--- a/address-kit/requirements.txt
+++ b/address-kit/requirements.txt
@@ -1,4 +1,4 @@
-pickleshare
+pickleshare==0.7.5
 geopy==1.20.0
-iso3166
-unidecode
+iso3166==2.1.1
+unidecode==1.3.6
diff --git a/address-kit/v1/affiliationcountry/affilcountry.ini b/address-kit/v1/affiliationcountry/affilcountry.ini
index fd3b7d7..d653453 100644
--- a/address-kit/v1/affiliationcountry/affilcountry.ini
+++ b/address-kit/v1/affiliationcountry/affilcountry.ini
@@ -4,6 +4,7 @@
 post.responses.default.description = cherche le pays d une affiliation et renvoie le nom du pays et son code à 3 caractères
 post.responses.default.content.application/json.schema.$ref =  #/components/schemas/JSONStream
 post.summary = Enrich one field of each Object with a Python function
+post.tags.0 = address
 post.requestBody.required = true
 post.requestBody.content.application/json.schema.$ref = #/components/schemas/JSONStream
 post.parameters.0.in = query
@@ -15,6 +16,48 @@
 post.parameters.1.schema.type = boolean
 post.parameters.1.description = Indent or not the JSON Result
 
+post.requestBody.content.application/json.example.0.id = 1
+post.requestBody.content.application/json.example.0.value = université sciences et technologies bordeaux 1 institut national de physique nucléaire et de physique des particules du cnrs in2p3 UMR5797
+post.requestBody.content.application/json.example.1.id = 2
+post.requestBody.content.application/json.example.1.value = uar76 / ups76 centre national de la recherche scientifique cnrs institut de l'information scientifique et technique inist
+post.requestBody.content.application/json.example.2.id = 3
+post.requestBody.content.application/json.example.2.value = centre de recherches sur la géologie des matières premières minérales et énergétiques cregu université de lorraine ul umr7359 centre national de la recherche scient
+ifique                                                                                                                                                                                                                          post.requestBody.content.application/json.example.3.id = 4
+post.requestBody.content.application/json.example.3.value = auf der morgenstelle 8, 72076 tuebingen
+post.requestBody.content.application/json.example.4.id = 5
+post.requestBody.content.application/json.example.4.value = z.i. de kermelin,16, rue ampère,  56017 Vannes
+post.requestBody.content.application/json.example.5.id = 6
+post.requestBody.content.application/json.example.5.value = campus de santa apolónia, 5300-253 bragança
+post.requestBody.content.application/json.example.6.id = 7
+post.requestBody.content.application/json.example.6.value = campus romanus de maron
+post.requestBody.content.application/json.example.7.id = 8
+post.requestBody.content.application/json.example.7.value = Inist-CNRS, vandoeuvre les Nancy, France
+post.responses.default.content.application/json.example.0.id = 1
+post.responses.default.content.application/json.example.0.value.0 = France
+post.responses.default.content.application/json.example.0.value.1 = FRA
+post.responses.default.content.application/json.example.1.id = 2
+post.responses.default.content.application/json.example.1.value.0 = France
+post.responses.default.content.application/json.example.1.value.1 = FRA
+post.responses.default.content.application/json.example.2.id = 3
+post.responses.default.content.application/json.example.2.value.0 = France
+post.responses.default.content.application/json.example.2.value.1 = FRA
+post.responses.default.content.application/json.example.3.id = 4
+post.responses.default.content.application/json.example.3.value.0 = Germany
+post.responses.default.content.application/json.example.3.value.1 = DEU
+post.responses.default.content.application/json.example.4.id = 5
+post.responses.default.content.application/json.example.4.value.0 = France
+post.responses.default.content.application/json.example.4.value.1 = FRA
+post.responses.default.content.application/json.example.5.id = 6
+post.responses.default.content.application/json.example.5.value.0 = Portugal
+post.responses.default.content.application/json.example.5.value.1 = PRT
+post.responses.default.content.application/json.example.6.id = 7
+post.responses.default.content.application/json.example.6.value.0 = Unknown
+post.responses.default.content.application/json.example.6.value.1 = N/A
+post.responses.default.content.application/json.example.7.id = 8
+post.responses.default.content.application/json.example.7.value.0 = France
+post.responses.default.content.application/json.example.7.value.1 = FRA
+# ' restore colorization
+
 [use]
 plugin = @ezs/spawn
 plugin = @ezs/basics
diff --git a/address-kit/v1/cnrsunit/cnrsunit.ini b/address-kit/v1/cnrsunit/cnrsunit.ini
index b728301..7877d8e 100644
--- a/address-kit/v1/cnrsunit/cnrsunit.ini
+++ b/address-kit/v1/cnrsunit/cnrsunit.ini
@@ -17,11 +17,39 @@
 post.parameters.1.schema.type = boolean
 post.parameters.1.description = Indent or not the JSON Result
 
+post.requestBody.content.application/json.example.0.id = 1
+post.requestBody.content.application/json.example.0.value = université sciences et technologies bordeaux 1 institut national de physique nucléaire et de physique des particules du cnrs in2p3 umr5797
+post.requestBody.content.application/json.example.1.id = 2
+post.requestBody.content.application/json.example.1.value = uar76 / ups76 centre national de la recherche scientifique cnrs institut de l'information scientifique et technique inist
+post.requestBody.content.application/json.example.2.id = 3
+post.requestBody.content.application/json.example.2.value = centre de recherches sur la géologie des matières premières minérales et énergétiques cregu université de lorraine ul umr7359 centre national de la recherche scientifique
+post.requestBody.content.application/json.example.3.id = 4
+post.requestBody.content.application/json.example.3.value = umr_d161 institut de recherche pour le développement ird um34 aix marseille université amu umr7330 collège de france cdf institution institut national des sciences de l'univers insu cnrs umr7330 centre national de la recherche scientifique cnrs umr1410 institut national de recherche pour l'agriculture l'alimentation et l'environnement inrae centre européen de recherche et d'enseignement des géosciences de l'environnement cerege europôle méditerranéen de l'arbois
+post.responses.default.content.application/json.example.0.id = 1
+post.responses.default.content.application/json.example.0.value.0 = Laboratoire de Physique des 2 infinis - Bordeaux
+post.responses.default.content.application/json.example.0.value.1 = LP2I - Bordeaux
+post.responses.default.content.application/json.example.0.value.2 = 199512079F
+post.responses.default.content.application/json.example.0.value.3 = Institut d'écologie et environnement
+post.responses.default.content.application/json.example.1.id = 2
+post.responses.default.content.application/json.example.1.value.0 = Institut de l'information scientifique et technique
+post.responses.default.content.application/json.example.1.value.1 = INIST
+post.responses.default.content.application/json.example.1.value.2 = 198822446E
+post.responses.default.content.application/json.example.1.value.3 = Direction générale déléguée à la science
+post.responses.default.content.application/json.example.2.id = 3
+post.responses.default.content.application/json.example.2.value.0 = GeoRessources
+post.responses.default.content.application/json.example.2.value.1 = GEORESSOURCES
+post.responses.default.content.application/json.example.2.value.2 = 201320575M
+post.responses.default.content.application/json.example.2.value.3 = Institut des sciences de l'ingénierie et des systèmes
+post.responses.default.content.application/json.example.3.id = 4
+post.responses.default.content.application/json.example.3.value.0 = Centre européen de recherche et d'enseignement de géosciences de l'environnement
+post.responses.default.content.application/json.example.3.value.1 = CEREGE
+post.responses.default.content.application/json.example.3.value.2 = 201220322S
+post.responses.default.content.application/json.example.3.value.3 = Institut des sciences humaines et sociales
+# ' restore colorization
+
 [use]
 plugin = @ezs/spawn
 plugin = @ezs/basics
-plugin = @ezs/storage
-plugin = @ezs/analytics
 
 [JSONParse]
 
diff --git a/address-kit/v1/cnrsunit/expand.ini b/address-kit/v1/cnrsunit/expand.ini
deleted file mode 100644
index ffef47e..0000000
--- a/address-kit/v1/cnrsunit/expand.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# OpenAPI Documentation - JSON format (dot notation)
-post.responses.default.description = Return all objects with enrich fields
-post.responses.default.content.application/json.schema.$ref =  #/components/schemas/JSONStream
-post.summary = Enrich one field of each Object with a Python function
-post.requestBody.required = true
-post.requestBody.content.application/json.schema.$ref = #/components/schemas/JSONStream
-post.parameters.0.in = query
-post.parameters.0.name = path
-post.parameters.0.schema.type = string
-post.parameters.0.description = The path in each object to enrich with an Python script
-post.parameters.1.in = query
-post.parameters.1.name = indent
-post.parameters.1.schema.type = boolean
-post.parameters.1.description = Indent or not the JSON Result
-
-[use]
-plugin = @ezs/spawn
-plugin = @ezs/basics
-plugin = @ezs/storage
-plugin = @ezs/analytics
-
-[JSONParse]
-
-[expand]
-path = env('path', 'value')
-size = 100
-# in production mode, uncomment the following line
-# cache = boost
-
-[expand/exec]
-# command should be executable !
-command = ./expand.py
-
-[dump]
-indent = env('indent', false)
diff --git a/address-kit/v1/cnrsunit/expand.py b/address-kit/v1/cnrsunit/expand.py
deleted file mode 100644
index 15d094a..0000000
--- a/address-kit/v1/cnrsunit/expand.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/python3
-import sys
-import json
-for line in sys.stdin:
-    data = json.loads(line)
-    data['value'] = data['value'].upper()
-    sys.stdout.write(json.dumps(data))
-    sys.stdout.write('\n')