diff --git a/group_vars/all/vault_matrix.yml b/group_vars/all/vault_matrix.yml
index bc70e1cf07757d8c5436dc037daa78ac31fc3827..f51114279e059bca7391bef2c763dba861d9c127 100644
--- a/group_vars/all/vault_matrix.yml
+++ b/group_vars/all/vault_matrix.yml
@@ -1,310 +1,161 @@
 $ANSIBLE_VAULT;1.1;AES256
-66623561646463346533393330303063663166333033643935363466383433646166393432356262
-3763303066303432626263303734363863353635373134380a663831393639653665633062666635
-35363235656537373563363165323036373938653663623665336233306334303035656362346332
-3236303635346535360a643634373662613364396333626161326637393633393232306166663633
-37353065653730353134393039663431656539626565386239393638626136363465666235623066
-36663737363138666632633163323333353663353761633332316238613230353532616430326337
-39353139386361323863656433333535626662653166313861396530343939373562323434636135
-32323034636164653939366136633663363936633165653735373636323739323764653536616562
-30343962643764373666363165646663333765323763396639663564366164353865333335376431
-34373931383535626431333039346163636466343965326631633362663064626264373762336537
-36386437303039383530343264616664386666616637343766626265393137646138306534326662
-65623638616439663932636431343831613661303334323937363631373531666331656630326566
-62313930396431393066366336653663663836663036376438623564393532363638633962323837
-32383934343032396435323965346436306237336464653066343435323838396330613363346466
-63306266393931323266313534666134643337353330396661306333646662303730306663646563
-34646336376437316537316364353537376133333765636136666263353438383732393237343434
-38356233353939613930663030303365373137633161366161366663646137633262323237386265
-38396661306465626334313233313365313736383662353839383536326631613663653166356362
-61326634326463656164383137363166303963363263366162303035323863393161653038646535
-30636263316538646334646461613162653165643438306532313639653432663736333638333332
-66306466313663633733343536623761316130333963613333363762353666663166366562626563
-62636365666532333733373136636266336664363435366263616535633738373563383336613962
-31326334376130303939393638636230363964353364616231363132376133613164663366643236
-38386131343965663061333362393639326166663936623032316166373962633834306339653734
-62616139636333346638386631613961326162623638383761633538633634376430643334326532
-34383936333561636130643832356134396639636436353734353432653334373437663436306132
-34333638643261643331343065346135393062363733656433336635613665343433333033303734
-62623831313364306139663835393831326234383865656262333165643064633465306237373232
-37643332663038646161323732366363383662336532666166393761656361633265383137303530
-64346231623465313435666438303038393437323961636134643232316633613030353430323239
-66636131303563656633633632366266646166666635333132616362653830653532653932376639
-66633937373064343539383564386465383235353562343063616534363230313065353937326234
-39363030636239353635386164353166633763323063363264636632393237616639373837396566
-39353637393336376365313430323734303964336430383562313539643738613333316263656539
-34383736306464636135633861636166333439326135623735383638353736373136343961396636
-31636537633365633661623530366538336430316236336632353934316337326164656631663030
-37336361313739646266303437643966373666393630383836643533306637326537333939616336
-36346439353634326139303466363832666139643939666563323863656437663937636363653464
-62666634356564316130623137303031616635333137313062666534393061333333666332303632
-35623734373639613462396437653366613633313430616432306237376237393439373065343633
-65353835343434653236666463623662386364626538333734636163326566306332313438353463
-36336639306337646532646261383630393831653930653633353164616563386263326563313966
-34326130353235343136656538383064313263373262353439373735306238636635356238623466
-39303039636465646663343336653364666536393035323833306430346661376635333035333064
-61666139383638393331613436633066666635343330653031656139393339303838383430616232
-37633562353062353534643937633334326661333839303663623934336261633765376639656364
-33336238633766303061383230363266613766353834326661633034343634666163333037653230
-37653564613039363637306633393330363838336331613166303033623266343165663133303838
-30326163303763343037326463313236306266306236663034336139393138343065656562626534
-32306465383737303537663266363736333135316639666232333230333635613235623833393561
-38646431663762393834323031383338646531623665323339376433326537336639373362366461
-39616366666363633466623033646438393539356361376364656130323661353163326163373539
-61393038666432613061633239323832316530313663653535393636363739643466616264393839
-34323531353835393763626464343739306464623339336238623233346263663730313633353239
-32353430373765333965303535346364636139643432336264663530666233323838356562306664
-62666131316230313332383364323639366437613361646362623636313832353562643236323834
-64373862623439386562626262346130353034346631376465343832356338393431356535363736
-31643861363930656531313366303233613264376531643462636361633334386466636531326266
-30323231663161343630373630343437393362353732613765643939336430306437346261386432
-32323933633765643631343434303735363938373734663236636638353639383338303634636439
-64373739326339383137636262313738353236313438646162363061326537396130633734656163
-65356632386131396561353537663363643664643364656164653961616236643534363337373766
-64646430663165633139343139336432373030336430323738663836336266653961313130336431
-63616564303939666631633361613162373338333434386162613031356233363339313366353630
-35666533306330383634303561326461626233663136326438653834386265346663316138333134
-62623264323834373363666534653239366139396630333931326166623237366661323133323736
-65396434656333326639323561616330633965623962393866626461313265366364353966373734
-35366334316438656463376237643466373033363833633764383931376337363839373366343463
-35326436656339336536383463396362636337303037626534303632353933373231616136666461
-66386537306233623732323138313639326630643366636338346432613434326533653837383430
-37653739373932386537353965633633643730373330323165326135346665613561663838636464
-30326166653030646634366430336538623165323163393165356261643437653731323063636139
-63656132313663303435613334613137306265643934356664393031663131346539643632343563
-39346433313466353565343731303437306466653863393665376232306465613266316135373933
-36313438653133623161343263306531393563626633663733633561326265633435396364363233
-64333733653236336536333133343432623737616461326663636330356535326335383630306562
-66353839333934316232366530346263313232623237626130393438653839646661336439626237
-63323635363461393365396131653639646335663331353736333838626364643231633166396165
-61646539316366326363306132336562333066396665656238333261643339653666623933663261
-33323730356366363438393734393332363034306633636336626133636631353737616233663434
-31613430333365666233303734336662376631663238656236626565656435303633303834313732
-38353233333965376561613639396336386562633061366137623764396336646536623237626633
-61373763373436303431656635333639623564316230336334653336613566393063326365656536
-38323738376138366136656562633538306666303835373731626636376262396361346261323038
-64363763313133316565626663363938613163326139376666623964343537633939343839643930
-62613030323263643862613365343363336463303032383833333635343961393265316331313233
-64666462623736393430366266373563303864333665336636653139616639333830623034396332
-33643361386137373765366465333866346332363037353861316161626230343862386165313431
-34626161613735373365393966366464633362613563363934323263393230376235363661323662
-66643262363232623336643065373438303533663063653963666339666266303765356162343338
-39333865363533663566366662356633643234303339313431333736363335663531643866326666
-34333364353039633164653963363938353837643562303133346238393037376333633832633832
-33323238303631663333306434643838313764316465313466346463323334343439346530643838
-63303539333366353437343661623437396665373664316663623263323266313165616366373835
-36376439343163663831323061653163333361633333646237346465323666366137666436626437
-30396536343336613536656433353438643066346564313430393636633561376334383762343863
-33366636396532373639353034613830633461613230626365333565366463316136353765366662
-66386336323435336536363566646161626236356563666639636535666330663230356133646633
-38396537313966306334393536623866666431356166386639613335383035663564646363663939
-66633436646466366265633232356234393163313164636530346238663730653864346266333838
-34396432346232396336366261623166613066333638656439316332653835623865396436333261
-35383436623736656230303862663739323136623766376236653666653265353030386562326465
-31396366336362646134623633306233386235653865353037666338326461633734616565356138
-66336439666532643061366263336362313630383434303436656333656433353136653763303732
-39643237636137616630636166366364343866636362643435313039626533656263623365373665
-34646261663164646135316432313061306330323339376266343433306236333765333735343831
-66643430653437646363333632623238626238303663643030666361343962653536386365303130
-39303565363537396365373465653237306339663261326537316636646430636332386562623064
-33386435303334393765363131373530343663633537366636653033613462366338343535653538
-63373435393263633338363331366538633266656262636338326163396331366538656139313839
-38613835396537343031663530376331306139316164623338383766373366363234313661653533
-32333335663964353263373064313837393565326234633066396433343632303136613766336664
-61383634373533666239316465636262313731393632663464356439313331393533653133326132
-66653435326465373737633932343363313531653137613661363738366465353764333639366462
-65306439656235393735626135663236376162653938383762366434356466663033386661623536
-66353438376233646638343166626436643035336637653966636465343535623233653064386665
-35616432313439313665303236373265333833663564636632653065363061323262663139346263
-38613939386638343936386234353831633837613232343430353831356165666465373231363663
-66633533316563386439353064653436353065666635666366623764343064313232343436643536
-39613161343134356136376537323039353630316435323137383837656231346565636261323932
-31643864336139636139656537613737343966636535333438386161653438353961666261633131
-37666630666434373434646434376237316139633639303363303764303738663564323030313835
-37306330663065393664336534646234336434306231616431386465353437613233326562333066
-63383136373036376464666239626232353132646138373338306461346461366537643436386265
-64613064313634626362613864626433313231366138393064633066396437386230666139306435
-64653037643164303866333339383331653336373165313238646261373234363534316234353737
-39623663656162636334383564366363313437616561393763626635343161646537363234336334
-64393135393039643338313430656666643966353566333065356566663231646166646532336462
-33633466383731333162323338633733643631363463366435623730333132656533623630393762
-39303530356266613437373739363062633636663932323130303463353161366433306565646666
-33303230393865623464376139373133353766373034633264343866623463613065626337303963
-39393933306466353930336435313261303234616464333564383863643736383336626366373435
-33663031653361613562636166346537343739653834383963666163333235353964613262336366
-32646634313536393532663366313937653764636261363763313662653239363130653139336663
-30313731363238326338666631353265303163613736333235626237343862626166646530303837
-63353235613335613839646165613338363032343437336639653566313530653634356330336464
-64343236646339656161636461383166656163316334366366393461363961333434386237663838
-65316432356565633939396138663531623232323763373235306430373964643836383566643166
-32636439306263356561373664623761623064313637373434323965383364646635666331616632
-66623732303462363435323065653237343337653036643266656538633265373766353462313633
-36643065653032376230366235643239396138376161306339383237363338343665366233393865
-65393736646133346332346230303235643237306563613038336630623431356631353632396534
-66303764353465376237663430653238393162326533303138356432373033363465366130366137
-65323339323837366662663030333363363831343632393161316463393162613035633861626632
-66626537656134643363373866363561636237363135383465313036326639396337376266373563
-31323231636335306236366561626535306632363636613534383332323938373439393261323238
-66636335643738326238626661646231383961636137323734313731383833633037623062616636
-36666638383233616366303230396637613531636537363965386363636639376662613363323434
-65316364373365306536386236633766623164326663363133333036363435396362383630393462
-37333638323433613064366334396138323738383638653834616266643961373330646266383965
-38376463653034383430336435393631643266643661613335653164383366353931343063643630
-33366435346566323764643731656636336162396561326231623334303836613862613537313739
-33366432663461353739333461376137356437613338393833333237633531636663376566323938
-30623735346230373335633964356332333537323038363933653933336537613562363835306531
-65353864336232643262396432313839393638383865666330303532613165333830663638656163
-38656563313962326534643235313734383437633764346538373637343737353962393564646236
-30333633653164306230363765623230386337663632666264393763353939393566656363343834
-66333039363736386565326630623635623266616235623332663334653138353339626237346337
-34646133373330366363373865393333646165616261306136366338383932373835363530333964
-62613735653535323239653031626234356436383736643333663066653261626164376561373531
-38653062643963623536626635393037343366393332363463316130333161396635393938343933
-62653063633830303765323732373239616636346361336263316662356339666663623336323533
-65313061633736626533386663346337306239303830653562663766393739373632356333343866
-66313765396437636433303531633537366164346338363730633434346539626230653362303066
-36636461666162633239363331653866323233646565353130393465313930383133636635363564
-32656134306234383462383334613030643739623738666466363165383031626463666131643731
-62313031663766333364396534656232613764353763643632623635313930613631336138663332
-30616536313631623066613131613738336161623238326131653937643738653863633939643162
-36636566666635393436643332666233623766616333646231393337386664633832313731646466
-31393738643966383331636163386630633237393033623063326365623464386137613962623937
-33616535333435326433316365333431396263316362613133613663303430623230613939646365
-63313936343634643235393866613534323335383261323233303936643133656539343734366432
-32663965376565623531353533356632623663383465386531313838633962333739626233666231
-63313434316562366638343066613233323064633835336664663463356436376463373630306162
-33333431353430316163663738653339613966383761336238383162316166366137303365356437
-39633539346238633438633638353536333434353833636564653030313763326532343664333838
-35313232383235653366323462376533386530653164376365356336626637306465376336666635
-36363135623137636630323464303766363766326437666665653239386135653365326436333063
-35353936353264353163323261313561376664313631313638653734343934633637386536643033
-66653537353731376334323933316561373237633264656330353834653363303939306632643936
-32323230383033393565373033666537396439613636316261653937313061626530323939376237
-62366238366333356565643033333732306362643734333838373532663466633333633864613733
-30393536343538343137303830353565326163376432623137396565373237636164353837333966
-31643337373735626563616135343464323664333832613835393539393135356137643832373965
-31626162393334663635643637643639346362313433653530616162666537633936323332303865
-63653362326364656563353761633536643562316531343266356131366331373463393863386131
-38636330306465613466313037383734626435343662393438396233633138393761343561313763
-31383164353336636639653961356337636665393733376332643737643665306565353638663236
-33653766303135396436643539313539323136613934633730653030373231383038663833373063
-64613430323932326165353961326634616166346366373836333738666361323639653461656237
-32346363336235613130316637333739633734316630306131613336633236336263633635383733
-34373765323033376565353433346539313130383362656634343139643437316665613364643733
-32376464353663633062636530393130373638306637313465643162613234633061366536626138
-62653337613463356236313366666431643731343333333661656337363265363466643033313039
-39663335663266306538373230313364313138396633333232346163623236313832376134663064
-30613335636264393635366136306465636130343063346636653338323866653938373463363639
-32623432336431643832633038326261623036323131366266613566616432373539356239323465
-36633262616435323631666439646265643766303435363030333664616262383531333033323239
-35336630633834373430333539316332616463363137656333653338376635356537626435613562
-31386461303730316231383766353234306363316465616466366231313132613666313730303934
-39613266623537643636326639346366653363313237333439356339366362346463636631653038
-65366436336633636135336639336339653766353238623561356533616562613266633331666461
-37656636396237336336376530356132666631616530336531643437373634623564333037363238
-65326633366136393763386332393531616266373834663737333163396237643763616135366531
-30636431373863613463303763383636663939343039663063313531316265663661633339326466
-30643638303565396537663139353231343331396163616431383265373366646133363665653035
-63646435346535323135626631643139643966356434323766636534666531623635306530623165
-37336432396364386162633934663931373338643765656466396339306663643836643535303836
-62373638663665386433336365356262376233393036343062633638313834323932346439316137
-34653966653233336439373331323761363162613835373362366165643666326533353761656330
-64626131613537366466633436626361333361626266633062306334663261326236383466343266
-65386665306638313831303564373162333331383862366533643138633834633639383238333063
-35616637333233376161323962336235623963656265373964623231306639383634666335633531
-33343530316365326338373465623134623961346463353837316236313935383263373230363337
-39616666323366653234363134663162393962373838323666663031616638643161663432663965
-65646562373736393364343430333765326437353037316535346166306438613363333132393535
-61326131333538306266653338346466633736623134346263663262646531326337356138306439
-36303263373831656537666332646637343032393233383739373939336438343465396262653661
-64653830346331373633656134636135383435623736333462313938633532613236633965386635
-62636237313962393466303735356263363138363866386439396366343734363038313235643266
-39326661333833643564363163303234636163343663663435653038656630306231613538653132
-34383736356435653038643735623366623031663265356432663165373133393037633264393665
-33623636373938346164343661383362333933353830633432306262313865613234663433353962
-35386464353732643031333339373162306131646236303566363937353863343861653064623230
-65383365633463313138616562653431353662623332616536343266663935373334626166373766
-38663231303563363564636339616365333730633731613430333461323764376137373266323161
-31643764653037343937646333616162613662616137306663616339616536643337663465616161
-32643965626631363963303037353862343334346164303733306265383532313639343634626164
-64303837616263623639323733393037323631386439616137616430356236336434383963633733
-38373838626435316434363864643765306363613636393732366533346634663330313839623630
-30383634323766376332346436383365373739623638303564373530393730346237623363353061
-36346433646361336436366665343736383138356139396465346331346266303632623836363766
-61373263383862656165313035626162646431656132316461363538373964663264343134363432
-62336263373636383332363338326630626364343866326161313961383666333734613666336238
-35313965383665616430346561623435636230333431643861653539623863393663613232326436
-66613935346334353235303637316263666363343766653638326637336139303663643635386561
-63623731346539333233393663336130663562613634643037336461343863343035623364633864
-37353466616238306130646134393864323963616633646436363137393532333535323934383966
-63363338643630363534636531336633633862656364616163333333616532373332333638303736
-37656136633239323939393837663965666434653633613630323430343032663537373366646437
-32316564613234636532333833333037613833313162653235393063346666373335386239633639
-63333437333863656130626566656638373761366331356437363466656464626265616562366232
-36306331326133316634343335613765313563373931636634326235353434373137643561316134
-61623732613837376566373533313061373663616265393039396136333932366631353835383863
-36303065623839366365336364383261663966306538336664613530616335653862646230613165
-66303230666437356137306633373437663732616531336566653034633462333562313462633434
-64666265316666613262663839316433356465376330616338643931643738316163386433303531
-66333061353564383633663135336365636165636138373166343662383138353831386637306264
-39346663653435383133613437663665373237346165646363346464353739646230383435346534
-37613635386563623566353035303361316564336235653563626435346232333236656135666461
-30386136663462353662353935366538303765366235393937666139383265366634353232613763
-32633763353034616261643033376365313937346535306264373766626436333032656430316338
-64326235613330626662643734663761623333333931366566656533626365633031353832656338
-36346537633032313563343834396431666136326633313536613764376165336236353562353565
-66386538363061396534333362313163336237363832343538633166653265383935366561396364
-39633763613232666561303233353833653037356662366232613033353331393130636232613839
-64313337663766393633383865623161646239643664356338666637373366366332346237656336
-35616632386130323537633530636665326335383535323931653465363065316231303164346334
-38343336343133613631316363663166623734386638623061626139306237646363653039356265
-61343062306361656438316633353639353834386566636430323861373063633064636364613337
-63376161396433386130643366363439373633616636383363643265323734313361306362653636
-30363736623631363037613363306166626362336535396238343037613461363666663362356639
-33303534623666313637306239313832666437333331323631333934333030373439653230336238
-30326561363863366430343666373264356262313165633038656435356436646331396531323739
-65326164313363393436653633376465623130663331396264653163366337363664346361383662
-64613434623766386661653836376539323935356536326361666630363162383863333061653164
-30386139643731306562386135336466323339666638643030663163346434303166633463353538
-36343166333233386635313066623936323861343736363031663334663433626566306235363664
-39303534663939303765626230303062363439303338383631313539363739313832366539653566
-37643038346435353136663439343334323834643237393539396433616339393735633462363165
-37623930393639363664316530306637646465643564636665366634366564303063366664333565
-39336565356165363065316331313166363637656136663132373934343562393866393830363266
-33383566616162376339343362343633393431616563393662313236303135303438323762386431
-35663866316239616632636133313965363334383137653465323136653866633164663539346134
-61336631373032313232636461363366663065316264326239393463663461646331323064326562
-64343037383866616666316264323662366132316232306164303638663866373165356265323839
-30613461613165343737396237386638333166633763383937316438626338643663366437393435
-61353634623036393965353936346438343834353166663335363164613631643730633530623136
-36393236356335363936653736376131383966616566666636386238323561643766386631373064
-38356235643432353861333565343236386431393032336666613838623736363764646566336531
-63353437363265636239343463386666323332353263636562633537613937393333626262386261
-33633864646666316561663661663438316334616633313933393238396437656138393539666230
-32333735383432663338623336303031633965373139356132343831303432343934323530353135
-31353863623036323936313966373534633831613761363130366265666665366536613331343736
-33393330663361326136633631353862633933313864383431313763393538396265386263663630
-62343664306366373933663561306237343637636564396364616335316432363037373035616361
-35316532656132623934303233316262336131383833333062336236393132373936366136656466
-64653834393237396435666163336362386463343864616139363535303263613539333962346465
-66623637616463633466646364376634323930313364356630373933643062623638306134356430
-35386636623136663336333362636537646666343830346164666236666134386164366361306631
-31366462356337373036633932363663383066626237643633613835303737383961396530656634
-61363063613439633239353838656436333137656161646633663263323037383963303161303338
-35303464626564386463636436376537336161396264643461393637363533666562386261633666
-64666566616237616161626362333832626438653737306662333235663064343037393464653331
-65356261343732373163346632396630366435323638346266663362383536386131643962623134
-61366361323633346233613130323063656238646231326466646333326232393337666663636462
-37346361616139636232616630623538623531623165623462663062316566363832646632393033
-63303066653834356130343662363764386636613734396137353664356632616264633365326664
-39363365353231656537343732326564636639353762333966316666346532633331333066646433
-34396161383436363063393935613063303765396431616336303736666135323364303165303132
-36623330656165626132653265653563363366343733313534613065613936613130363331396637
-31666134303738326134623536363136393063656130346234303664616266626532383164656134
-32633263393932643036363835313235383033643531326334366561636230333136346138343137
-62363761633833363538303864383732626265656361386331313030316530306263653330653162
-64303834643231646534383132626165393632623230383330386164383330336339633163366537
-63663731643935333331646566313962633038313764653134613963633634363734363966623564
-38366464363435326130363139383265323931346534356433306537353761663036663465653364
-37633236326138313164306439353339633666363838643234613632353433346361663536346263
-39316233343936353936306339336561313535323362323666343834323632386133
+33386534316263353433353138333733663237366364663336306135373161326437326266306162
+3033356131623330306131303130383434313931666332370a343630626231303436653261363032
+33393038323565306137313931386439353663393635306531376364313565623136326336386263
+6531323639333330300a626333626237643233393238316237393935326234663335373466656363
+38366237376563653539306531373665616431356230366535366631376235383062626362656538
+64356333363264633062316166316133393130336361663634383461346465386638346439323866
+37326463363631623936326139343434663363303066623732353931393337313837323234643837
+37663962616362623737613933366161663137343962386530333034363232313139636663396336
+30383562376162326135326637383666643033343634396338636466323263366238363164363430
+30346337383963666239323936353735616266333062653064663137643862336530393563313062
+33613162366632623434393531333762663630373039323364326361646434643562343534366365
+30663739633439343237383036626239386363313664643932363162343333323066393563323830
+32616365356639623738653462333835636162616534646362386231313564343833376664383531
+33663461336537373465646137646165383732653430653664376139326639353861333535643330
+62303131626537316434383564633836643062663064616631326631313434653262373065306134
+30366464356231653563383966643530383933346366386137303933376365623538613733336264
+32616335313162653461343738663634386364623330663433383730636363666565616164346436
+38663630313365313834626562396562376536663866333765633336306538663964356461366332
+39646132326262393837636534303434373739396264333266333335343164333731663665356132
+33303535356137356261376134353966613461363830336165316236363364333463346164313364
+62306630313030363064393538303336666264343632393435316233353761383438343461356331
+34336432393637653938646233366132363565643830643162346230633437613737376138366239
+36313130333366323135663139616232386666663930613063653664643732376634303562386466
+36643935333561613734393664663135393733346139343134376566653635376532346331356537
+61363538323935306232336132333461373139646337363434633166333464663339653863356637
+31663561393964633534303436623438323761633261356438366436366634626132383365633138
+30316234643865386535346633386135353963393133643231346262336637363163646536633933
+31353232623037323338363332613937636439636665303235396464346636346664346231646364
+33653161633965663232363665623361333666363132373665616436353832373966383338613265
+35656232363037653634323463656164363032663533366463396236363130393734306635303239
+61336530383962613363376164633631613363343436333263663039333939336237663264613563
+33396338393838613037396530373034643934353064306530353639663632303632613634316665
+62323563353061323662666464613336646633353032666135356464336539643132323231666437
+64353530326238633932343137373766366261363366363632306338303230396431636432363330
+33636233326433306232333363326662303763383835653830333338636338623736656433633536
+39343032373663623334376664356466383335306630663735613836646438333835313035656132
+62343365376235386630633136363761313232316364373232636532613739373733366435623333
+64313738343666636530633136353739303866363034633538623532656236656433366134393330
+64666161616331386238323161663038643136326435663463656532356661663338386336306630
+35363530356262356432623931353334356334356138333564613762643639663637626233373737
+34643963373265316639616335616632366630646265616638643463623562326264633739616164
+35636230333939353530613733366130366239336362376335636164356435373066636133386534
+35363266313833323134626339386166393737623762366533616130323361396335656538643530
+62303737623732326361663365356335366161613261346361336562343533613639613434383139
+38386639356633303733646162356638356633636136303532653135353965353763383132313030
+63613861376539376630613334616530636265643265623638336531353038626537323961333362
+32656665666234633838343736323337323631303666333636656366363230383461633836373364
+32666663343466626633646464646435363161363430343733633961346531656139356535663035
+32356539646630646431303865303530623564383861303034313938623362663635383638313062
+63666266643465303365653032616630616161336261663064363266623962343135633031393232
+31373664363032626262383736393166646539366138333562386537346365333164343438663366
+61366663376233636563386532353035343266643836393763343539653136356662393934616234
+64343738353238326634623634643535383838343934303837656335633861366430376237646535
+66396437346635623331326531666638613661613931356562323766626338343561653066313132
+64376630323061323130663766656465663732626366383636646433343565626534633565653262
+34343330653638313438633332383265303861623766386234353865366639303738636130626436
+32316565373933353138633764313662383431653865656262343337663465333734393064646133
+38396432306665343536386434303062393832333931333261623162316633313161323662613738
+31303639646265653435393739366466373033636164393935353136326432343739353034313034
+64363036623365323735366338386261636639303139663866303261326330643939333163663561
+39316463626439633966336262396265643733386636613330653339643564393430343438613362
+36653161303034636165303763343033383961376638613761383364616266376433616538353166
+61316364653766343566613266366434623664343338353233613034333133373061623834326361
+65646330316137386237386664343531636331313462346434353535336130343136643339343638
+39346262386262336331633933383534396437376665636162646563323763363661383436376164
+35376664663564373662373237623334303165323763333161333332616138623865353138333466
+37646436653934343336366630656139343933656538636361626339383730303833343233613634
+32666264613764623566363163383363666162303862313537306338353934623765346463623738
+30336535363532653864663063636433303865646564323135313864396265663133323664303061
+64636535653562356236376337616630383438313866373865333735306261633832383166316638
+36653466613031663861393766313965356530633139616336306663653930623765376163303764
+33313133333665653262656662626538316539613630326363646538613265346561393635393065
+38353231353734373737366165383237623037363261373962386133623434343666373535653335
+31313966353533616536303064616235613733333462656632353936643761373363303039303133
+36633737376662353236386362366635653263343063633637626534633966323636316263633762
+35343330383331613435623831323865313661323334353537616638383039666132356234656135
+33363765326236636335303638393065636462623632643466353238613233336437386561303665
+63383237656161306632666638353731653336303733666330353339323366633265373239343264
+39653161396637643138373937393330313733336136636634663264623139646331613731666561
+35396661646664333663666265663539636538643131663339616339623661313533383039363661
+33646164353665366639366664386563643435316162666563613039626638613639363466333065
+63306432396234323435336634633362623333353964636138396163323930353364306465636135
+36623662346165343061616332663838373939353636623265363439393039653164356637613766
+62326332633639653633663266636134303533356639386336316337313162316635653563643130
+33633235626634363733363864386338353661613234363663376538356239656232336265626266
+61343035666437356630373262383562336662656636646134373562623032643461336261623862
+34333661633330363734616464653262383430383762343139646132643534356330653261306239
+37613538323134646238373030633566313232616462666266653337633430373432336234366665
+35373332633165623238356365356639386136393861336631656263326636373835633764646330
+34393131616639383939323031636234363164616565376432346138616639336564666165666166
+64646530316663333935613739663133356332616438613231333061316464306230646162353063
+65316137666266636530663637383434636465663738313631636532343461373939656331623035
+39636130623631653331643430326632663638336165643865633131316232663830313238363338
+37326334396233333838623363396466353864656264323663306533613739663231353533353738
+31616261363237313637653038623030313235316533313266333638663434626364643533353538
+62393631636331316536663962653161633962303239343036366339343232313330383039326637
+62313535613134313835363431666665353734663136333564393835376266313866323737316165
+62643736363532373866303462363833323964363835663961663935343033393838313730333938
+30376663646638643037383937343230663065626337656463386366356336333962356339643235
+62653663616236343263343037306463633362366136623039636638643766313765636537663532
+63353963333162383933616639333936653834323131613136316166663934646266633735663763
+34386234333933363634613939663037356135663038343439313535363366353265646332363261
+31636530343661363861383865353134393161643937323431666236346231363864353836393034
+35303865643835613535643437613833633238373933383066613931356664393138323762306137
+39333931343832313264323064353365623830643539363565666637363637323136326164653061
+34336663323732666233636230363237383435613831663763313736353735616535653866653261
+31396435656333356335303635383164323166653637346432386334373830353661363964336463
+38366361613637313832643234396162303764323438666335313134623837653766346165633531
+64643331663839376666303532323439636661393834383136623137373130306335393938346436
+38663166333039353130323431343066396531643736333366663532643961386564373537623862
+34333738333832633331666164313838383564663532366437376561323464323732346235303733
+65613062306161626632303337356435633763303832346431653038353336376438353065376637
+38366138633965363366373939383666336561623139343562373230613764316163623733616637
+34623430393764323761636532363037663836336366316437353734653865393433386436633230
+37356565313038396430663037653739636662376239393166623534356463306333333533393638
+34376537656661343538613362666164643063313935323934323061326635613331363666323135
+30333036663263383263393466666365303666306435393837306262373866646661393065656431
+34653734343131323534623363303835333761353538353530313436653834346437373366303164
+34613937636335366166633966323134656565303230376163346365306363623433643538336339
+63633665333938616136666461623862326561613465393931313136656334313265613963643232
+62316162376434363138333837373630616436353331656663626265356632353735363166653630
+38313734623833363832396261666537643930616531303735643838633431663332333261356639
+34353563626561623632633232343365393634323863393265633638303461306130383763343038
+37383134316536613437376665326239343366653538353633343662613630356530383537613430
+33663866306335323839646130623833323135316263653564623030336562646463616238346266
+31333439663465333837663663663065303531356533623361333031383837653036356265653437
+38363238336564393862666262393964653231633830373639306538303639643431323530336562
+63383739356337346331343933373266366131376230316238303464323535343461613563373033
+31386265383466363162336462636366323466613661643237646336663331323530636366363238
+34633936353161366137343530326439373936366166323234666231363635376437333533333739
+66396563633463633762656536313064656338646262316538666138326136633461326566366262
+63663232373230643938633736356565623936383762636233313938316661353237346335613237
+37333965653539373566393037636537383533393937396335366361333666353734333733656535
+35396162333865633033376165303963643230393731653832333562666562346566366638346332
+64353731393362306432616239326463356363313766303533366134333139333762316231343938
+38373235323863323863383333626136663064343165303861663662623532343139653338373366
+35663162383262336436373636623235656335663165323364646530666561376262356639376430
+65346561643037623734303035623064616636613134343661333138663733346532386465623430
+37633262306561393366393335376162346263373832666136373665306139613430626533303030
+36623336633433636232313661366635336633373462396437366365363534336436306437643735
+64663064396230653832653339366630393035623862383563653138623137633531616665353466
+36623237653361636633353739303633633637623661636564643631613731643538343539363136
+31353861353664316437643532303838353437396435303662613839626334326334393635646563
+37343035363134313337313162376435653234303864666338626565323730653634653462356630
+63376631383138353961336562616662613933393438376562303862363735636631383333356530
+64323263643562653864323836633863373063383062326438646264396364303335643431393131
+32616539366432363236646436643165623061323864353432616163376662373066633030303262
+38356537363438373130656661356539356361633437353165376237313661303532353536653635
+34353566636165303962646535383436336462353962333531653133383931353938353062303434
+35636236353033303030306461373239316131306631393065393733323163396461303362626537
+37353637376163373965303939393434616131653765316664653234643439313034633936313238
+38666464313339626131643463643764336261303534373366393463613939653461386132303363
+36396164383163373136643961363735616534323536643131366363363762353132316530643066
+36323665323535376234393765303565393366613836393635663435313764373935616330646132
+30313732363866303363396235303962613766363265633934666633663430393637323135303630
+61313465306663386534393632323662643533353131383333343238333738353032396238376262
+34643964616263626138373436626462333634663335386639633164306461643264616361666665
+36633634303063303765653031656138336161353863306365376131643937366631613661313239
+32633630623833663339643232353963653731356534313863666239333863616262346335343631
+33356337646335646531
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index 489b38f50502e3db9d4c7505bd8bf34bde9fcdef..68c065e38a2b00da22dfc44edd5c2f391d7a2527 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -82,22 +82,6 @@
 - name: install irc-bridge registration
   template: src=appservice-registration-irc.yaml.j2 dest=/etc/synapse/appservice-registration-irc.yaml owner=root group=synapse mode=0640
 
-- name: install federation certificate
-  copy:
-    content: '{{ vault_matrix_secrets[matrix_server_name].federation_crt }}'
-    dest: /etc/synapse/{{ matrix_server_name }}.tls.crt
-    owner: root
-    group: root
-    mode: 0644
-
-- name: install federation key
-  copy:
-    content: '{{ vault_matrix_secrets[matrix_server_name].federation_key }}'
-    dest: /etc/synapse/{{ matrix_server_name }}.tls.key
-    owner: root
-    group: synapse
-    mode: 0640
-
 - name: install signing key
   copy:
     content: '{{ vault_matrix_secrets[matrix_server_name].signing_key }}'
diff --git a/roles/matrix/templates/homeserver.yaml.j2 b/roles/matrix/templates/homeserver.yaml.j2
index 1ce4293cc22fd7e65b13421ae8390d67df8d8d9a..507f4a7ef3eb2b2be805a5635f2a934d4e1bc93c 100644
--- a/roles/matrix/templates/homeserver.yaml.j2
+++ b/roles/matrix/templates/homeserver.yaml.j2
@@ -1,4 +1,5 @@
 # vim:ft=yaml
+
 ## Server ##
 
 # The domain name of the server, with optional explicit port.
@@ -72,6 +73,16 @@ public_baseurl: https://{{ matrix_domain }}/
 #
 #restrict_public_rooms_to_local_users: true
 
+# The default room version for newly created rooms.
+#
+# Known room versions are listed here:
+# https://matrix.org/docs/spec/#complete-list-of-room-versions
+#
+# For example, for room version 1, default_room_version should be set
+# to "1".
+#
+#default_room_version: "4"
+
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
 #
 #gc_thresholds: [700, 10, 10]
@@ -189,11 +200,11 @@ listeners:
   # will also need to give Synapse a TLS key and certificate: see the TLS section
   # below.)
   #
-  - port: 8448
-    type: http
-    tls: true
-    resources:
-      - names: [client, federation]
+  #- port: 8448
+  #  type: http
+  #  tls: true
+  #  resources:
+  #    - names: [client, federation]
 
   # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy
   # that unwraps TLS.
@@ -240,6 +251,22 @@ listeners:
 
 # Monthly Active User Blocking
 #
+# Used in cases where the admin or server owner wants to limit to the
+# number of monthly active users.
+#
+# 'limit_usage_by_mau' disables/enables monthly active user blocking. When
+# anabled and a limit is reached the server returns a 'ResourceLimitError'
+# with error type Codes.RESOURCE_LIMIT_EXCEEDED
+#
+# 'max_mau_value' is the hard limit of monthly active users above which
+# the server will start blocking user actions.
+#
+# 'mau_trial_days' is a means to add a grace period for active users. It
+# means that users must be active for this number of days before they
+# can be considered active and guards against the case where lots of users
+# sign up in a short space of time never to return after their initial
+# session.
+#
 #limit_usage_by_mau: False
 #max_mau_value: 50
 #mau_trial_days: 2
@@ -286,18 +313,18 @@ listeners:
 # instance, if using certbot, use `fullchain.pem` as your certificate,
 # not `cert.pem`).
 #
-tls_certificate_path: "/etc/synapse/{{ matrix_server_name }}.tls.crt"
+#tls_certificate_path: "CONFDIR/SERVERNAME.tls.crt"
 
 # PEM-encoded private key for TLS
 #
-tls_private_key_path: "/etc/synapse/{{ matrix_server_name }}.tls.key"
+#tls_private_key_path: "CONFDIR/SERVERNAME.tls.key"
 
-# Whether to verify TLS certificates when sending federation traffic.
+# Whether to verify TLS server certificates for outbound federation requests.
 #
-# This currently defaults to `false`, however this will change in
-# Synapse 1.0 when valid federation certificates will be required.
+# Defaults to `true`. To disable certificate verification, uncomment the
+# following line.
 #
-#federation_verify_certificates: true
+#federation_verify_certificates: false
 
 # Skip federation certificate verification on the following whitelist
 # of domains.
@@ -745,7 +772,9 @@ url_preview_ip_range_blacklist:
 # This means that, if a validity period is set, and Synapse is restarted (it will
 # then derive an expiration date from the current validity period), and some time
 # after that the validity period changes and Synapse is restarted, the users'
-# expiration dates won't be updated unless their account is manually renewed.
+# expiration dates won't be updated unless their account is manually renewed. This
+# date will be randomly selected within a range [now + period - d ; now + period],
+# where d is equal to 10% of the validity period.
 #
 #account_validity:
 #  enabled: True
@@ -915,12 +944,43 @@ signing_key_path: "/etc/synapse/{{ matrix_server_name }}.signing.key"
 
 # The trusted servers to download signing keys from.
 #
-#perspectives:
-#  servers:
-#    "matrix.org":
-#      verify_keys:
-#        "ed25519:auto":
-#          key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
+# When we need to fetch a signing key, each server is tried in parallel.
+#
+# Normally, the connection to the key server is validated via TLS certificates.
+# Additional security can be provided by configuring a `verify key`, which
+# will make synapse check that the response is signed by that key.
+#
+# This setting supercedes an older setting named `perspectives`. The old format
+# is still supported for backwards-compatibility, but it is deprecated.
+#
+# Options for each entry in the list include:
+#
+#    server_name: the name of the server. required.
+#
+#    verify_keys: an optional map from key id to base64-encoded public key.
+#       If specified, we will check that the response is signed by at least
+#       one of the given keys.
+#
+#    accept_keys_insecurely: a boolean. Normally, if `verify_keys` is unset,
+#       and federation_verify_certificates is not `true`, synapse will refuse
+#       to start, because this would allow anyone who can spoof DNS responses
+#       to masquerade as the trusted key server. If you know what you are doing
+#       and are sure that your network environment provides a secure connection
+#       to the key server, you can set this to `true` to override this
+#       behaviour.
+#
+# An example configuration might look like:
+#
+#trusted_key_servers:
+#  - server_name: "my_trusted_server.example.com"
+#    verify_keys:
+#      "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr"
+#  - server_name: "my_other_trusted_server.example.com"
+#
+# The default configuration is:
+#
+#trusted_key_servers:
+#  - server_name: "matrix.org"
 
 
 # Enable SAML2 for registration and login. Uses pysaml2.
@@ -997,10 +1057,8 @@ password_config:
 
 
 
-# Enable sending emails for notification events or expiry notices
-# Defining a custom URL for Riot is only needed if email notifications
-# should contain links to a self-hosted installation of Riot; when set
-# the "app_name" setting is ignored.
+# Enable sending emails for password resets, notification events or
+# account expiry notices
 #
 # If your SMTP server requires authentication, the optional smtp_user &
 # smtp_pass variables should be used
@@ -1008,22 +1066,64 @@ password_config:
 #email:
 #   enable_notifs: false
 #   smtp_host: "localhost"
-#   smtp_port: 25
+#   smtp_port: 25 # SSL: 465, STARTTLS: 587
 #   smtp_user: "exampleusername"
 #   smtp_pass: "examplepassword"
 #   require_transport_security: False
 #   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
 #   app_name: Matrix
-#   # if template_dir is unset, uses the example templates that are part of
-#   # the Synapse distribution.
+#
+#   # Enable email notifications by default
+#   notif_for_new_users: True
+#
+#   # Defining a custom URL for Riot is only needed if email notifications
+#   # should contain links to a self-hosted installation of Riot; when set
+#   # the "app_name" setting is ignored
+#   riot_base_url: "http://localhost/riot"
+#
+#   # Enable sending password reset emails via the configured, trusted
+#   # identity servers
+#   #
+#   # IMPORTANT! This will give a malicious or overtaken identity server
+#   # the ability to reset passwords for your users! Make absolutely sure
+#   # that you want to do this! It is strongly recommended that password
+#   # reset emails be sent by the homeserver instead
+#   #
+#   # If this option is set to false and SMTP options have not been
+#   # configured, resetting user passwords via email will be disabled
+#   #trust_identity_server_for_password_resets: false
+#
+#   # Configure the time that a validation email or text message code
+#   # will expire after sending
+#   #
+#   # This is currently used for password resets
+#   #validation_token_lifetime: 1h
+#
+#   # Template directory. All template files should be stored within this
+#   # directory
+#   #
 #   #template_dir: res/templates
+#
+#   # Templates for email notifications
+#   #
 #   notif_template_html: notif_mail.html
 #   notif_template_text: notif_mail.txt
-#   # Templates for account expiry notices.
+#
+#   # Templates for account expiry notices
+#   #
 #   expiry_template_html: notice_expiry.html
 #   expiry_template_text: notice_expiry.txt
-#   notif_for_new_users: True
-#   riot_base_url: "http://localhost/riot"
+#
+#   # Templates for password reset emails sent by the homeserver
+#   #
+#   #password_reset_template_html: password_reset.html
+#   #password_reset_template_text: password_reset.txt
+#
+#   # Templates for password reset success and failure pages that a user
+#   # will see after attempting to reset their password
+#   #
+#   #password_reset_template_success_html: password_reset_success.html
+#   #password_reset_template_failure_html: password_reset_failure.html
 
 
 #password_providers:
@@ -1084,9 +1184,9 @@ password_config:
 #
 # 'search_all_users' defines whether to search all users visible to your HS
 # when searching the user directory, rather than limiting to users visible
-# in public rooms.  Defaults to false.  If you set it True, you'll have to run
-# UPDATE user_directory_stream_pos SET stream_id = NULL;
-# on your database to tell it to rebuild the user_directory search indexes.
+# in public rooms.  Defaults to false.  If you set it True, you'll have to
+# rebuild the user_directory search indexes, see
+# https://github.com/matrix-org/synapse/blob/master/docs/user_directory.md
 #
 #user_directory:
 #  enabled: true
@@ -1144,6 +1244,22 @@ password_config:
 #
 
 
+
+# Local statistics collection. Used in populating the room directory.
+#
+# 'bucket_size' controls how large each statistics timeslice is. It can
+# be defined in a human readable short form -- e.g. "1d", "1y".
+#
+# 'retention' controls how long historical statistics will be kept for.
+# It can be defined in a human readable short form -- e.g. "1d", "1y".
+#
+#
+#stats:
+#   enabled: true
+#   bucket_size: 1d
+#   retention: 1y
+
+
 # Server Notices room configuration
 #
 # Uncomment this section to enable a room which can be used to send notices