diff --git a/service_definitions/public/gourichon_org/domain/Dockerfile b/service_definitions/public/gourichon_org/domain/Dockerfile
index ca37197..ef4363a 100644
--- a/service_definitions/public/gourichon_org/domain/Dockerfile
+++ b/service_definitions/public/gourichon_org/domain/Dockerfile
@@ -2,8 +2,8 @@ FROM fsg-base:latest
 
 RUN export DEBIAN_FRONTEND=noninteractive ; apt-get install --no-install-recommends -y bind9
 
-COPY named.conf.local /etc/bind/
-COPY sites /etc/bind/sites
+COPY bind_config/named.conf.local /etc/bind/
+COPY bind_config/sites /etc/bind/sites
 
 RUN chown bind:bind -Rc /etc/bind/named.conf.local /etc/bind/sites && chmod =0,u=rX -Rc /etc/bind/named.conf.local /etc/bind/sites
 
diff --git a/service_definitions/public/gourichon_org/domain/bind_config/named.conf.local b/service_definitions/public/gourichon_org/domain/bind_config/named.conf.local
new file mode 100644
index 0000000..9d518d1
--- /dev/null
+++ b/service_definitions/public/gourichon_org/domain/bind_config/named.conf.local
@@ -0,0 +1,18 @@
+//
+// Do any local configuration here
+//
+
+// Consider adding the 1918 zones here, if they are not used in your
+// organization
+//include "/etc/bind/zones.rfc1918";
+
+zone "amphi-gouri.org" {
+	type master;
+	file "/etc/bind/sites/amphi-gouri.org.hosts";
+};
+
+zone "gourichon.org" {
+	type master;
+	file "/etc/bind/sites/gourichon.org.hosts";
+};
+
diff --git a/service_definitions/public/gourichon_org/domain/bind_config/sites/amphi-gouri.org.hosts b/service_definitions/public/gourichon_org/domain/bind_config/sites/amphi-gouri.org.hosts
new file mode 100644
index 0000000..44bbfd5
--- /dev/null
+++ b/service_definitions/public/gourichon_org/domain/bind_config/sites/amphi-gouri.org.hosts
@@ -0,0 +1,39 @@
+$ttl 300
+amphi-gouri.org.	IN	SOA	ns.amphi-gouri.org. hostmaster.gourichon.org. (
+			2018110402
+			3600	; ref = refresh = 1h
+			900	; ret = update retry = 15m
+			604800	; ex = expiry = 1w
+			3600	; nx = nxdomain ttl = 1h
+			)
+
+; declare real hosts
+amphi-gouri.org.	IN	A	82.64.72.120
+dev.amphi-gouri.org.		IN	A	82.64.72.120
+br.amphi-gouri.org.	IN	A	82.64.72.120
+;zaurus.amphi-gouri.org.	IN	A	192.168.129.201
+
+
+; which real hosts handles services ?
+; web
+www.amphi-gouri.org.	IN	A	82.64.72.120
+; e-mail
+mail.amphi-gouri.org.	IN	A	82.64.72.120
+smtp.amphi-gouri.org.	IN	A	82.64.72.120
+
+
+; map services to declared hosts
+; e-mail service
+amphi-gouri.org.	IN	MX	0 chez.gourichon.org.
+; e-mail spf configuration
+amphi-gouri.org.	IN	TXT	"v=spf1 mx ip4:82.64.72.120 ~all"
+
+
+; infrastructure
+localhost.amphi-gouri.org.	IN	A	127.0.0.1
+amphi-gouri.org.	IN	NS	ns.amphi-gouri.org.
+amphi-gouri.org.	IN	NS	82-64-72-120.subs.proxad.net.
+ns.amphi-gouri.org.	IN	A	82.64.72.120
+ns2.amphi-gouri.org.	IN	A	82.64.72.120
+blr.amphi-gouri.org.	IN	A	82.64.72.120
+ag._domainkey IN TXT "v=DKIM1; k=rsa;" "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRBSmO59IPsf25g2TrBYNKvt4z7W9ALciaNxTb4JknYWAA7FfKrI1Lq1ER4MN2m/QqZ5s8fNXnUVYyn6KXCg1JGWVXnqmo42lF1d6F3Ibjif9GgbVJkvD15e+FZuNYrSvzu/cIPe09Q0wgG5l4wgqoy2xmE1xWi4Bri1N8Z6Ddsj3/OIqBzVvalJJIhimMVwHdTE/ZosZlcdI1"
diff --git a/service_definitions/public/gourichon_org/domain/bind_config/sites/gourichon.org.hosts b/service_definitions/public/gourichon_org/domain/bind_config/sites/gourichon.org.hosts
new file mode 100644
index 0000000..193be9e
--- /dev/null
+++ b/service_definitions/public/gourichon_org/domain/bind_config/sites/gourichon.org.hosts
@@ -0,0 +1,33 @@
+$TTL 300
+gourichon.org.	IN	SOA	ns.gourichon.org. hostmaster.gourichon.org. (
+			2023112501
+			14400	; ref = refresh
+			3600	; ret = update retry
+			604800	; ex = expiry = 1w
+			300	; nx = nxdomain ttl = 1h
+			)
+gourichon.org.		IN	NS	ns.gourichon.org.
+gourichon.org.		IN	NS	ns2.gourichon.org.
+
+gourichon.org.		IN	A	82.64.72.120
+www		IN	CNAME	gourichon.org.
+
+thirdparty		IN	CNAME	gourichon.org.
+smtp	IN	CNAME	gourichon.org.
+mail	IN	CNAME	gourichon.org.
+ns		A	82.64.72.120
+ns2		A	82.64.72.120
+@             3600 IN TXT    "v=spf1 mx " "ip4:82.64.72.120 ip4:212.27.42.1 ip4:212.27.42.2 ip4:212.27.42.3 ip4:212.27.42.4 ip4:212.27.42.5 ip4:212.27.42.6 " "ip6:2a01:e0c:1:1599::10 ip6:2a01:e0c:1:1599::11 ip6:2a01:e0c:1:1599::12 ip6:2a01:e0c:1:1599::13 ip6:2a01:e0c:1:1599::14 ip6:2a01:e0c:1:1599::15 ~all"
+chez	IN	A	82.64.72.120
+videoconf	IN	A	82.64.72.120
+irc	IN	A	82.64.72.120
+gourichon.org.	IN	MX	0 chez.gourichon.org.
+localhost	IN	A	127.0.0.1
+gourichon.org. CAA 128 issue "letsencrypt.org"
+_dmarc	TXT	"v=DMARC1;p=none;fo=0;aspf=r;rua=mailto:postmaster@gourichon.org;ruf=mailto:postmaster@gourichon.org"
+go._domainkey IN TXT "v=DKIM1; k=rsa;" "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmby5xVAOx5YLC4+fxYIsKXRrJ9vEoZs6YVUbXyRRz4/eKN1ZLHpBuHMZljR6HeBn8PUOZNBsCYO9knIqFVb/gZpFyxhS9RLra98hEktE8a3kb/JI2ecg4BNwwlAhLs2uzkYV4qh81W/wuWK4kOFYQjIn3jaH6hLlse2vJC015vu+EFtmyqL2GaB/OvCnwFcDYEV22eg+KC/GcA"
+
+smtp.local IN A 192.168.46.64
+imap.local IN A 192.168.46.70
+
+tzv4aqcwgp2x.gourichon.org. IN CNAME gv-nnkietw4il2fdn.dv.googlehosted.com.
diff --git a/service_definitions/public/gourichon_org/domain/compose.yaml b/service_definitions/public/gourichon_org/domain/compose.yaml
index 7e3bd12..d87ec0c 100644
--- a/service_definitions/public/gourichon_org/domain/compose.yaml
+++ b/service_definitions/public/gourichon_org/domain/compose.yaml
@@ -4,8 +4,7 @@ services:
   nameserver:
     hostname: gouri_nameserver
     build:
-      context: ../../../../andre_etckeeper_history/etc/bind
-      dockerfile: ../../../gouri_infra/public_services/gourichon_org/domain/Dockerfile
+      context: .
     ports:
       - "57053:53/udp"
       - "57053:53"