diff --git a/inventories/z9/host_vars/yate.secrets.yaml b/inventories/z9/host_vars/yate.sops.yaml
similarity index 92%
rename from inventories/z9/host_vars/yate.secrets.yaml
rename to inventories/z9/host_vars/yate.sops.yaml
index 5c0d584..cb34db6 100644
--- a/inventories/z9/host_vars/yate.secrets.yaml
+++ b/inventories/z9/host_vars/yate.sops.yaml
@@ -1,9 +1,11 @@
 #ENC[AES256_GCM,data:Oc2DdKVMymwkIHbS84TeTQY=,iv:UMhNafqQrHaF5iqFSev6D1uqHPFpKQTkOpYV6JncjsU=,tag:mAmBMyGdzER3hkSkV2Fjtw==,type:comment]
-secret__sip_trunk_epvpn: ENC[AES256_GCM,data:kH0Sjk7PXsg=,iv:avgJi2Mu7ax1J7iCJ4QzuG1z04ojrzfoDCGISUXg7Qg=,tag:yw5uiP86H1164VzHUFzryg==,type:int]
-secret__sip_trunk_fonial: ENC[AES256_GCM,data:1dRu6qh4/O0=,iv:TZpk/ZAMvIGTuFBHUn0r+CJhgcdYBX9gxnRWgfhCGDs=,tag:A2PavL2FUjpbnym6CPreKw==,type:str]
+secret__sip_trunk_epvpn: ENC[AES256_GCM,data:d3iilbnE29J1hyL3,iv:PWYRqumnPkqhQvXNCnWVGpwkOoiljzoX4W7ngeZzw0A=,tag:uChMn2/d3rl+7XAAZ1ACzg==,type:str]
+secret__sip_trunk_fonial: ENC[AES256_GCM,data:Cm0ajT2OCfWxsw==,iv:+JUIhZeFrbx0M4uKJTt22qnL/rTiPv09B58Vxyrnu1Y=,tag:gH1EmyByqTxvIVnyPmO1ag==,type:str]
+secret__sip_trunk_fux: ENC[AES256_GCM,data:Ea7SDDXydgXWtQ==,iv:8G/w40wfH7pjhJJQOLt3u82iIC7hFonDQ2JEdD9E1mQ=,tag:bcPJPAU4/TkJbj2MCY3htQ==,type:str]
+secret__sip_trunk_fritzbox: ENC[AES256_GCM,data:ThSo8qKi6/Zp+RZAeI4nqgNH,iv:nI8aopaf/sggOT9IFsqRmDjrA+CwNJkzs7Ijk9dqyCk=,tag:tSWudnc5ShV355I+zPNczw==,type:str]
 sops:
-  lastmodified: "2025-07-04T17:35:26Z"
-  mac: ENC[AES256_GCM,data:xfna0LQlalbXeK3Uik7VyelxMkTJr2yc6DDyQ0y8DUsTgTzrmtbNs89J0vR4CBiMnkmZyw6WkhvfJeLQOURQCwZHB3y+mrsIRax56XW1OskV1u3WSI//eSv2bXaQ5rbMMvaz7kYlOE51mhJZnOb3mtLmSE3IyxkaesjBSeHpdw4=,iv:OK/VzrNHE3zWJNi/OhnChzOGHN2OP7iN2r9G1vlDEBM=,tag:ehFxhu0HykJcBEejWgKJ+g==,type:str]
+  lastmodified: "2025-07-05T09:03:20Z"
+  mac: ENC[AES256_GCM,data:g69iJFNEdScehBwUieiwp0J3r2JiT9VBau29cj0d7WiYWXiAaw28RmiLY/nchPwJzuFhDYOzHJezPVGXjfZ8dcdo4BR3ixfP1Re+NLlDzoovLWUA9Vgqwj7Yhi5Du0GtZGcBs9hfP9J9H++a1r4Qe5aojUd0Fm2UUqu+6O0Lfz8=,iv:unPfNCs7eKpeHdvQVneJTr3i/2vzKXlo8paaBBBtaXs=,tag:r/wQOJP5wPXacXwUQxuhLQ==,type:str]
   pgp:
     - created_at: "2025-07-04T17:33:05Z"
       enc: |-
diff --git a/resources/z9/yate/docker_compose/accfile.conf.j2 b/resources/z9/yate/docker_compose/accfile.conf.j2
index 6a3d10a..cb5fbd3 100644
--- a/resources/z9/yate/docker_compose/accfile.conf.j2
+++ b/resources/z9/yate/docker_compose/accfile.conf.j2
@@ -1,44 +1,35 @@
 ; Yate will register to these SIP services
 ; see https://github.com/eventphone/yate/blob/master/conf.d/accfile.conf.sample
 
-[epvpn_test]
+[epvpn_ccchh]
 enabled=no
 protocol=sip
-description= testing in/outbound routing
-username=
-authname=
-password=
-interval=120
-registrar=hg.eventphone.de
-
-[ccchh]
-enabled=no
-protocol=sip
-description=yate.hamburg.ccc.de
+description=Eventphone EPVPN CCCHH
 username=1008
 authname=1008
-password=5kVLqoQ7CmCV
+password={{ secret__sip_trunk_epvpn }}
 interval=120
 registrar=hg.eventphone.de
 
-[landline]
+[fonial_ccchh]
 enabled=no
 protocol=sip
-description=CCCHH landline
-username=
-authname=
-password=
+description=Fonial CCCHH
+username=fo370381tr317349_00
+authname=fo370381tr317349_00
+password={{ secret__sip_trunk_fonial }}
 interval=120
-registrar=
+registrar=sip.plusnet.de
 
-[doorbell]
+[fux_intercom]
 enabled=no
 protocol=sip
-description=CCCHH doorbell powered by fux-infra
-username=
-authname=
+description=Fux Intercom CCCHH doorbell
+username=1337
+authname=1337
+password={{ secret__sip_trunk_fux }}
 interval=120
-registrar=
+registrar=172.16.210.2
 
 [fritzbox]
 enabled=yes
@@ -46,6 +37,6 @@ protocol=sip
 description=yate-fritz betatest
 username=624
 authname=624
-password=n0vr3jn305894j2
+password={{ secret__sip_trunk_fritzbox }}
 interval=120
 registrar=10.31.210.86:5060
\ No newline at end of file