diff --git a/coreos-config/group_vars/all/rendering.yaml b/coreos-config/group_vars/all/rendering.yaml
deleted file mode 100644
index 4ddb9ae..0000000
--- a/coreos-config/group_vars/all/rendering.yaml
+++ /dev/null
@@ -1 +0,0 @@
-render_blacklist: []
diff --git a/coreos-config/group_vars/all/vault.yaml b/coreos-config/group_vars/all/vault.yaml
index 73f03dc..51b90d3 100644
--- a/coreos-config/group_vars/all/vault.yaml
+++ b/coreos-config/group_vars/all/vault.yaml
@@ -1,222 +1,222 @@
 $ANSIBLE_VAULT;1.2;AES256;secrets
-32623830343439386430353437636564376132363936343631373338396164343264346333666661
-6435313731353566303166613236613462303664313631350a386461383236393561316461643433
-63653939306165343563386235393635376666653439613333396537643033613364616539663032
-6438393464363966360a353731323638313038633562616631653432336130613562393964613437
-33633064333935646561333466303931316464303662643466396330326339373834363962393235
-64326235343033303763366366333961613831613366316231646666363836653165646434393763
-31373836666561636263653830373538633637386264313261303735313837633839313332373536
-64656131633934313666316439346361366532346263623765383334656566326433396330326365
-32396461323934366632376463333734653736616432306562613866396231663766393834306334
-39366533386466616464663532313764336662306162383334333437376335666434393161376361
-31336235633032323334613437353931626231323765303938613161306565373034336636336131
-34656332343836326134363831373463646638663964346131653065386634333333333266383939
-32396362636361333363633836323134353037333234316636303139383962313039306437346561
-36303932636564306562393461356433643063393465356461663764356438616337333630333663
-65663638373064326236383762306237623835393466613834366533653264323562323232613462
-37306537383263353839633432666333363938636535333333396632356265653263326332616363
-33346439653931626565346564323662323463386238323662623831303864383163623633653634
-31363437643762316162306433396463396333353666396665363230653062643336323636313966
-30653732633837383138333263303538656531343335306430316631666364323631353863373730
-66643330383732393733313830323763396136633635663235383732323832353761393735303865
-30353033663434383163363630376535323231623635653139616230643466316638663137393135
-63373731326263613032333235323466306632313363393064623165313063636331646361633131
-39666230353064316332363535636537363261313732356565643731623963333533323335313936
-31356439633564633666383339333865363435396433623637633339393265303261646432393365
-66346462353838633163383430393237353333386562333165633766323763353965353332353762
-31363334373534323065333839353039356330353166636663313836373534353935636634313038
-35636364336235376565313264396464323665343339633733333839666434633861613566373837
-37366461333865666531663464633264363034386666643235373531336137663435353138306462
-39343336313337363130303864393136333431383462326335613235623238366130393431626661
-62356163653933383733663036303731306236353739346263643031303133306364393939643335
-30633738303330353730626130356534323031623732316461366265336137663262353533306366
-37306237333030636434663230303938313330303462663338316266643731613431353231663339
-37363363643733646339383231343835333935373536313534333462633635396665396263376563
-36616431353863633438323965363030373336616563616233643462633933656132623934386436
-66646465663434623835343630393931343330636534303535353239643363343763306662666663
-63633561663238396335373362303565393931316439373064343233373534653837656336383231
-64323163303365303935373833376235393966613563306235313564386635316630646166613961
-38326336376430346135353866366430313438396438383365373535313831613266633966303437
-33373537663264343964323964663335653530613132333135383037336134333261326338376431
-63313135613637343036353835643064323533376432613436623835353730373936633735386231
-35333139366139313430633464363837626263623137333061623564306235353731633662386138
-38623734393733356436646539323063353831633537636461393532663565613034353133663333
-66643062326137373934393134613436316633396563373231636362376366376333393639663066
-34633932656363643832643839346564313864343731343765393566373639666436623138353539
-36393463636363646132646636303561343563633961383831313333623964656437633735393261
-34353437646462356436373438363934393937303764656133386661383132323738393935343165
-38396262343830363637623564396636623131306236386333336138663866626362303938313631
-31653964306234363430356536636434343262663965356338636263303165333437363533356135
-31326266356266656436326636316436306336313966306638613833633631663633346265346163
-31373764383533373330363763623461383838393836316330363434316532646332356232393639
-36666231363164613166383565306330653434303366313665656139356164386336376562353938
-63376364616639383838323465356465353530663664396633663331613063336366623030633861
-31353636663836386465376235366434636566633934353532616338646232663566653436396536
-35366231303762626239666238316465326634316366313563336539613065343561626532656137
-31663933653433366530366136356634383462353632623636393031316363303431613062633962
-66663735626333313266323436373438636531396131393333313264623261663638343166356339
-65613230353564333330303164303966313631396532656263386533666633393362306362333665
-64633566356132323461396161343861353930323563366534393665336235613062343138393739
-38316430366664373438633064383761353431623366616162393166313837353664633538343963
-33313833353665383764306137383238353864353765366437356666333036663463613765303736
-35343536333664643463393261376262633531396133626337376566333463336232346262363834
-38333633613763303837633035333366336434663636366664373966346131346532633830313330
-33633762303032383562343134393239346131656161303032613333633761636563366161623231
-33623030666666616464383666373739613334343562386665303161626536323732386263396264
-62326365373036333536616230633330656334623638623331623365653735356165616133393562
-37363733663738366634616635383335393761343831646635333732613739616263316566333231
-63386565353764646334356538626262333433313231633130313930333865633132663166343136
-61383735376533616135643435343038383566633036356136633463353232316665306334346431
-38336230643365626565653137383332323266643865316234643162346333366631383863636264
-62656538323533353263366330363336636163643735643861383966383735643532383230333963
-30656366643661653534633939666331336666343931386632623033313633336238653939623039
-31373335383364336138656432326565316431353534396562626330663538376530333761396237
-62393932376665303266656564313764303332363733306231656130323832376636633962656466
-39333562613933353965643433396662383062666539633234396532343239336435313936393136
-64383063653930306236623936336566333639373966656630663238323738343636336164623561
-66633831393130653937333735326134626439663237383237333936643837353561353062616266
-63373737643835656464303237616263313562346230316661336330663464383631653765663663
-61646361386136616362623634343263363936633832613236613939656630303934633438303062
-31313761396535363837623037336635323562363831323139666132633961616635613637353962
-34346130313865303932333733366465633130353033316131313966303832396635646538376563
-65656562343335376564623061633538616162373339353138663734316665396561306135656161
-62313037626537326161623666363461343138353062626166646665393333383139323566356166
-64316639313566373663326565363535343864363237653136646233373639303162653731383339
-34656139343366306663376363616130363430393162646430326135616531666334356333623038
-30646432333939626338323433643233386130646238643766326661656362386264356463396634
-30663137643163636361313737353964383361343761663730666231303865303036333361613066
-62656161663666313062343465623135393933346265333431346432613638323937313933653164
-65323437343035653539393633656530376133306264613837616262656434396266613233616238
-36336130393962346662613832393663346564323765656165633330613665346631333231343766
-37653539363764363362623764396638323437373530373034626133643235636434323366636435
-31396230626663616132393137353838636433393033363537366564663435373462373366343966
-66336664366132333766653863366562383733313435383163356437343334653262633231646138
-64373331383333356631636538663738383330373666663630663462353833303264653961636130
-30626264356433303963633733623234346262393637396463363363353038663130616435353238
-31646532663061366365663935326439383831613635646138643435323765373464623465666631
-30646361373137376630366565363730373138326361313165393261323739656336363437303739
-30613435666536623666343266343236623361313262313665393364323232373933303832366263
-36333336323035633338376465383137303833343866343066626463346237623361313065326262
-30663261323436626332303033636634323738386665333834643165613063613335306535623865
-66633666663634303439643261336561613666646464383235383438633039383164626231663130
-66333161326465313930366232346136393438323232623563663639363566663039633965393335
-31316363636366663435633534626462323264303134663331366332303565366264386666356538
-32613037373331636133373836656661393031313735626464316230393230313535396363303461
-30326537366237656636316465383461323332356333396432633033363638353364383131316438
-63393936326661373838313734363734303639366237356232383938336134653862643439663232
-35653433323364323234333763663138393634626336303538326262373138376434383734333736
-32393630373539316237626366333139633836306563393137383031663138343064653666306439
-33396264353965396266623363666334343264663439656234366531353838646136623563613035
-63366434316132303031633239366238393930363139633739646639613961396630343264383965
-35353933616331623438343761616138303961393037343935306538656164343463656464383362
-30653065636431396465636665333161386139313334316539313333336338623232373834326636
-39623763613065386463343037366634656632643930393435616335393664396261383232336335
-66313039376362353930646363396566303339323937353462386335633366373932306334656431
-30656436636339313863626465343163333330363736323639303135356236336332303665383262
-63663433353463303631633335363336623562356436386261323134613065313536366132633662
-39373936316364656465666462643334313163343435353938646462313734373966656536316532
-64643161666331623465313565633937333237313062376466356235386539303661336137393861
-66323263363230333535303534366165666233393462613738346165616666616463653431333031
-38343431643664313064646239376233316537656233623539343137636366383264393163313635
-36663238333135616331396130653732333638336461353337383232653936613766363535386661
-66653866643539356539633361643233623966363761633737363630333437633062366462326332
-39363636623466656332663737353263373233343862383461316262383766396131393931313963
-36373131316162613964306634393561346365633333353938313130663166663762343065663236
-36313730396234303438323865333565626436613833363064303831313861646230326537373665
-62393764653831336461663166323663343638373438326466343536616661396166333734356530
-65643835343637643465323635616237363839636331343738313662393761366330313239633034
-33336430353866663462623166663761356539623765616239376265353733356166393032623438
-65353139613666383935363961333037313165353530646664353035396266346235376137366333
-39373863663561386232373162643263626530653438343337373936343063393861333735643464
-39636135366231373337636165383036353939373863363830383032393936656363646236373963
-36363762353465393736636665323132316663613237313665666236636536356536633739643663
-31656463373262373366336134386463386537393065616330363364396565353639346365373261
-39663231346464653333323366376630323663353461326364383066396634343739386136313562
-66353461616632366531373136646237623530333936616230346533653561323733336563643133
-31303766666164336633316334396563636464323438333037336563326633366230353063396664
-62646638336538316337623165376333303135346364383832653732396236363538626239316466
-31333631373238643537343164643361643565643365303033663064383235363965656339643166
-62306464373438376561613066326165643237656334376361356339343437326361323639323730
-63393536636134656532363065393262306634336538373763383664613738663039656264626533
-30313062313939316537343434636166616439346234346539393464623631646536386534356164
-32363038633434356161306232643030383033306632306462363234303263316337616430353436
-34653134366232643962376264396330323662393965323236323666643937366139346637313936
-34336664613132636634353733666365346266333766623765643237613035376130646530633365
-66616538383433366135623263626336366534383738343731386466666434663761643766303131
-31333637376265383065346435643133306337613839326533666665393139323063376238653137
-63326665663933386436356363333136363264313861636261346231613665653133303337313638
-33663965663663633232326433383337336639376231363761366130313639313733656532613538
-62356562373333663761646636303961316561346366653766663263303634333666303565333866
-36366330373733333165343530393830616262623634323165316134316434353261383833366464
-64343936613762623464626463323735656362323361383464316132343230383662653133313032
-35353135343031646666333063323535616266643662633934376536626462656236313439346432
-32373036396539343630653030313964663732656661643439373637373361313961383936613664
-33396230323336393462316637666637313737356664393835613634633530353635363566313863
-64373636616536613735616464313166656136383765613839653464633235343834663631653336
-61383938316163613133663437616639646538343062396264343732343136666463643062643463
-31313833343332336237346364656636616439356536353635323932393238376434623936643531
-35643231313030626136386130633361373663613935386461313936396631383533633538356634
-33333663313439356162383166613834633935316134376538353431626232303061623263346366
-34626535306566386564363332383064633439336134336136343938643731383164333131323235
-37323639306165613136336461353130383239386265353162643139323365313635646231383032
-36303466393539376634613763393365363464363861343465353763653465386339326162373431
-31353565656535613330643938613631623738326539376561663161356662343535613839363962
-63326565353038633039633566663330653639363762316138353739353837356638326566393837
-30383561386137393138326639383332623134343339326466386161386433643335626363303666
-63393538316434373766323732663230663262313734363862353630623162376531323934663938
-33336365626466663365363830313563643534323461613262306336376237356564303934613836
-35303232303737633537316339316439323332663138653036396564326566316663333461333330
-32376536663866643933653637653237323462373334333931666632376432626261313730353862
-63613738326137373862323136626437386566653537356635663862373637636362316436626337
-63373930653661383939653137353139656663303537363535303332633533626436383438353234
-33373066656331343239353430646461393233623961383132663765666232376234316666616333
-30383733373764343562656431323635393037663339653537373336353136356539643333633264
-63363833643136343164623931656363326430623933313664633738313930666266653932383063
-32643364353736643130343038366131326132333530366535393332363763303163383165663834
-62373139623034326563666633363034663031336130356662363630303633346431343633313835
-31663264316466663535616233633261353964333434626438366632396135643730646637623536
-36383632326163653064343534363964396435306262356231373533643862646564346639303364
-39613063333934386139653631643564383230346534383763653235313639666164323966346239
-37366236303633626261336332613334613633666266346563656531326365373635303936616638
-30636332333263393036653135616637343331623137663335316338353835613239336262373835
-61376636376238366361393633336364666666393735373237363739313335363137376432373334
-34383964353231386335336263303133663464303462376532373164663865303230353462316462
-37333964386463343235613435323162383231383736663364383536616366333562653131633030
-35333337613634363832653966316266616665616238636238393935623839636366373963366535
-66336331386534333566666331356165353263313064663266623564393732313264376430633530
-34366535656438396464353463393231366637386466656131323039323835633238383837616435
-65663562333937643361363030633537326563353135336437313137353961383339343964383732
-36306365396334636638303732323465613534633736643733373534646636313166623966333636
-65636333386462613335306538343733636232643764333838303638643462343638633263633665
-37643834383130313134356437666636323435626565646164323539343834393661383336623937
-64373434646135323637623638663833623636613931653532333231393535383835646463323535
-34636639373637343532343037326638353565313436656665633932353535353531386531646434
-33333965353730323837376436366166626533316537393237646239356539336665373561653531
-34666237353934643130333564646464333337666235333232643731393834663338376165396237
-61343938336130353232636564396334616437356363623063323536396161373965316336363731
-35313834323262326137656537323639333437333866313561643366343036333661613366303964
-62353838323633656333346434626632633637386262643137386234343631656435363637383533
-62326633316565653061626436653431646263666531373466326337383733396666376336303262
-62313664393234343333333364306263356237623738363338653337636363323932373130373332
-39336233623435363766653062323233366232633938643264376135663338613539333035383761
-30303561333838663934666535396532316435626332653766343437386633306638646331643730
-38623136356137633332636363353732646264343162366438643831353137663437346234396632
-30323431303762303930313337613961333663353534303566313038653866623365386536316239
-66616530366634303464633934653763366661383538323165663538326532653733656434666166
-32313830646134353632383866353335336132306261643961653530353435623436333565333735
-38343831633538346433613266343135363063663861656338633132346631653934383339663431
-61656433613539646163646336666162383430613561336165386338636464643631633033633139
-65393765663930333436663335393733613363333266666331346161356631306330653266383866
-38363161653130326233346539313339623166346538313736303534626366313165666463323262
-61383662343632366439346163633566396163343030623966386362623461666636323632326436
-38383735643232643338326336383333623030393063633263393766376664653734323530363631
-35393834633630643962333464366535323363316537313062366334316262656432316136633332
-33613030356239323230376230366566383135663962366666326531383534663362303162616436
-63303938316435393831656363396262323062666533363465363965356538326233396630346361
-64613734633230333737656435613366626561366535393133303931313533643366643037313930
-34613261326265333634633535383238666666313330353735633738333639623766373637663136
-62666235343038363835323065313237613736333731626163313435616437363831663334373363
-34306139653763383066303032336363313636303539653239633661373335616232393234616461
-64366461306564373138303633626131333630626130666533363366663865356562383837366233
-31363165316338323035636565386464636530383530396462626161366632353363303563303965
-38653230363537343737616136313664623834326466316265363365656537323237
+37366430643761323536666232363439303033633132366361666566613637306563353933643331
+3662616466613439313434636266666238623736616161360a653732363462623836656464646263
+30343933303533356163653133336131666638623637636532303534363037336561353131613634
+6530633466333163310a623462666262316334636163383664666565373462613833653166323163
+63633934393533663766633666383132616361346438396166303630323638393134393738646465
+31623336613165666139656436666133343833343462333430626532336336636137643262383231
+36653439323432623831333931383033643837616538633064363364393465633539323032646635
+33643335386532643139643339363730633634303838316638386238386130663961643165353364
+30383438333463343733303732646439653034396439343166343765383163626337613930313430
+66626634333931363736313232633962613266356531616163326434633839316130386138663563
+63626665663063363530313166626338653166643731643435313830356666616366613232653431
+65343434346365396631366334636537663235363365623665316562623762373332646465653963
+62366364313635636265313464663431313437353136333162663261376137346662363566386462
+31396431343337643534313062666231306239353935393962666638633364306238633831376363
+36646631383461386630306165373438636430366361366262363666613531376164643465623035
+35646635336366626266393263363962663761333438336539656666623535336636613134396365
+66623330306134663030376661393966393930313030376230313339366434373265623266363761
+33626136336434366431366239376464323131316537316531366161393330373661326330346637
+30633161613035376461303236633433663731643165383331643163633037663430343435626237
+35303334346631373333366364383131356139376339353766663163343433626236633963643066
+35303064643834313536343232343866306634366666303563353539663066373162303731616435
+36366662393030343331613465376332383063333133643662353935626137626536653933303736
+36653030396662616461353033343333646531336366646235323839393665366463303539636461
+37623837666363373662356334383636636466323433353730323938356362613864383963643262
+64633264663532623632343132373636353561333231613734633435343063393163346331316238
+37336535316439653362323838653462656466373234373662353130393935643834396332306263
+62396535613430336664393732343265353939313131353839343031333936343765393461303532
+37653263643665636238383264316333396133363636373134303032336163656138633065393234
+33646430336665346564623262633666343262396131343032326163313533643632646335323539
+30626464343231663666393961663539393866303331633839353134353037656438353231306238
+61363065313631363262633162643936353962363239663166313034356637383630663830323736
+34623465613966636461623462303963373066316432316664663665303561343436383965373439
+65343461616330626233636535356364626637363632303735356330663861386532666136356361
+31306436383866646462323131653865376130393362373338646262396262623437363633633032
+62656664656562623666363465333530636665623362643834343637663237323939663262346431
+38623865393031613633376631333765643130383235343536646265333865633230656636383933
+63363838386239633931376334653662383163306637353233303833383339303532393732336338
+36306564326436393037633364373934613066613066663634356531663936633030613663343032
+32626638373139646234643831653162313738616366343437653465393266393464346137366139
+65363534343565386361326462353036333939383661623164373836366361393863373837306462
+31386537396337633038313232623961363936356463366362643162356461303063306635386663
+39373037396239383933323538306537613539653331353065326661643832343632333034666539
+36313961363630356462636337646535333966356565633966313835326438353435333338363730
+64303836623835613239653930393734636463663536343732613265323138396138326636313539
+32653139356562313534306465616232633036343966323335373936656234303336303436663363
+35636438336164646433646337326137623631623335643661376263343238336364663635613831
+65623433663261353266383630393036346162393031653364663231343239313564666461333631
+39306537396437323238653765376333656562363535346131323266383638323465326133346466
+39366632303461376530653432356138633230353061393133616631326339653839616633393836
+34336231336665396131343638313335363863353031393761653765303564663738383064363039
+63636232356634393162313437373031363433383532303533333764616332623938373336633035
+65653335343337393033633762326661313035613062656637656535633330303334636366613931
+39643330323064383164323465333662313036383430613432633932643737306432313234346363
+34623839396331343162316534313036613030643764373466643962393531666265653766376636
+32643538646536303233303463666335343335663764656534306166643433646237313862333139
+61623239373339343439363637323164323731376330343530363837373231373663333063646531
+38303636386635666564626137666262303831343861643132663136373366313761636537326632
+33393263626166643432303362353133356166643838336137616362626631316431636262663665
+65656362623866306339303635643465343064336639666633313830373661393161376439326233
+39316661313730616562616461653436373764326564656663633332343635656633633730636635
+33383261363063366436643738386238396663333138373732666138343662616265383938613032
+61373039393763316133373736353439333934653834393831396137653638313136323939616139
+33386264356537636439353736643238326166623232643433636335633464626661643134333638
+62353034323133636233346533626436333338373966346164613966613132616166383432636537
+61386130393332343961663938666332353263666135366164656461626239626437633463343539
+36366636396232616232363332373261643164613033633635386536323063386534373361626363
+34643264333665366462373165313137323163623366383861636630323966393930656430326438
+62666532636436663438383636333434643363623039643762383331663734646136323132653262
+30326530616166383334666166353839333633363561656138346166363162383861333561383330
+32633238343730623538633431613663623964636539636261613834643639323532393064303330
+64653938306531363238326663376635376238356538633666373438623838643831626463353036
+65383564363963396435303862333061323634323432613530303732646331646439623463306636
+61663332663333613232653764313234393464326532373866306237613933323935373430383261
+39333230656232353937616536623038303637363239653934626363323136613232373939626561
+61323031623066643130393732316133333965326233313965353162363537666463383662323766
+62343339353361393963303332663134313566663535333934386465336564313865313830356661
+34303036633235323935303335656161653762633761666536336535663962613531353632316465
+30666531643832643662623562373332643162663365623530346165616637336539356230613363
+38383333343362373061643135336330376134333066633963643261346639336538313365653833
+64383365636530646366333633336334336636656230343535343666613764636663353366653832
+39346135336432633536326364326538343834613237323732313266333762346464613736623537
+61326162323564333135356535366261346537623934386265306664323961643138643065373235
+38353636353832316562633139313832613062653930343331396463363438366435366665366163
+61316331616161346234333136356565336265396334653866343663356337386461353665326130
+33656532346231646439353635343966376666376630623439376366666339323336353464366436
+39646637336264663937396630323539626537626638353861643365656566323134303538333335
+32366637366263663464626461666535326663356339316531633936393066363961623065396239
+61376465353832643166333536613061353663323665613436323162386632623236393334363533
+66383237626563343235323864393636323864356562376335383130366435653463306336396265
+35366138306265366161373930616439303566313334323539663866663839383735356532316164
+33626461356238313431626331313334356362633430363036623662633138303437336434613766
+66616333646165616236353038393435626130626462356461323336373766643734366133613964
+32363235353933363934303730336235633633313964366435386662333837666163333030376339
+64653238373063616466666337643532623931303339616233336538663930303763666138653161
+37663863646531393031366530366362353766656539373630323031346165616663633338653333
+33633665383864313563656266336538303031373936373536373766633062306135336635646338
+33616266623731666561313939363263353738373337303765383837383864613633313366613030
+61613733323736646665663832643832356362626662623132363565363437656335313765636134
+37373666353231326136663462343964303231316330663366366330393638356632623430303563
+35623535343730313931323761663931326135326432353562303762383765613937333237613562
+35653931333765353362393332353833303032373930353666366162333730383636303863626132
+33363265643166333833643238343865393561376165306664623938373162343861303838303962
+32313161356335653362303237653936653737656138646432313838353464633137363230356563
+63353462663766313864653236623663363664636131343761343134366536623062636433343836
+63633736303132313239373034396336333966613231343331386132613165346334636461393864
+32373437303736303332343830353266393963613338323539376164343138373565383366306539
+38613739663862663164653230366632373936393539373565303566653333666331356237306534
+36363135636631396131336333666130616166643333653931306134376566303432393439646330
+64306531393865393939633865353932656138636335373963303933653161303937316637633932
+33313535363936646165663464623661376432663938636531623864306666653065303162356539
+33383061356236323539303438663130346533353939363866353833633932343038656539346531
+65636337656563356636376138613535623863663636353436623535373261363763303938663933
+63303639336438326666386232663764656334346132616435363734613432366661653036373733
+37356466316333376430303266373133373036333436323530376363333632393663373063346531
+34636334343435323461356631373038333937333235646533613839656433356135346438633539
+37663038303136363930336332346437313761636665323763303434613566323637393639623262
+63666462313139636339313838613065383861383761633261626539306338393634373164383531
+39303233663539356566306133393839316564356439633766333065646437616130386132613239
+33303466636530653331643334633830643538376263303565326630383633373237646666633635
+62333463623162636134353730353837313333326230343462383561623664303635386239306538
+35636564386334333932346639663630383937316161613638326364306361313738623565323265
+37343031643237626534356566343061313062626637363535363230333431353937613032353230
+36633865653234393337663163633734316566396533633534643632643239316231636262613166
+30366333366230306665613661346261623033353863346562343430613432373666313130653265
+31396333653839393838373835303237376661623935306538653263323430616336613066656438
+39333136613332646135383062663230353266323263363432356536623566653964643232326663
+65373964393462636237653539333065306165376636623438313461306438313335643631373661
+30323438393063613235633832623935336362613432333232383839656164643763376531326364
+33623962613331663263313238613066353935623231393366386336626539623764663933306536
+35626135623831313264643831396563666362373261623838653132656638346437633564613365
+30373034656637353961633638653532306362653765396663396561633566303666303938303131
+64653234653336333966616663386233363131666666656132393132613038313730633031353562
+34636164353962393338636463393537313465663065333764306630323736663138333338363937
+33656363333565303166333762373735363332646134626434343139663238653937326538383762
+31656136346461353238323435303065656539363039373734616234366135313764653630653663
+36616235656365383663386432613534306262383630643862353263356562386430636263313232
+31616662656430373637643762663535353233316630666364623063333663616231616562323363
+38363364333064656234326433343362636263353338623839663836306638326235306436306464
+36346562643663396233383062653136316536333565643362366162626231326661306464346664
+33393837303032613032346336376338643862643535386535656162616235636339666538663335
+61363939626434653035323237386331376462666233656337336465303938396161333638306538
+30656134373037633065303531646238666237386238643531346164303665383132663235346234
+34363165383036393337636461366533306366373433626461663664333737623662326661373963
+35396663356364346162623065346333373639383832383937366662643339316139626539303031
+38396562353638333036353635386663306564396164653137393161383965656339373438623466
+36636561366339323430363862323563363138316437376162303935653134373133643530643734
+65346638333935356230343633326237633730376631366530623134326334636334343066613738
+33636666343634326135323462343531323964333961313233613839636363653439356637323633
+64623233353666353964376639343062666436616432316334623463353630613734396331363731
+30663033346436653637666131336563303763363234316232363833323465626565363938333137
+31646363393762316161373164376565316336393562636163393161346434613764333739633962
+66663530623764333865356530613636653864343366356439363137353963666534386137386364
+31626139633432666335383537663262616639386331313163303033313333373463653037613539
+35343364323265663032656362633666353932303164623739343537653930623031383637643839
+63313537313135343730336139643733616532326263376134636535356537613736356363646365
+64666230323761646430643966393837373533623731653131623231353865346666376332376236
+33336232396630306135656432663561646562353637366532643833663833346231343233653738
+35613062633432393061626566346339343361666363316562623035636538303631343466656536
+33313430343264336663613233666437346635336562353039393034316437616632396334613763
+33363238333739643734666162396633623936633332363863383639306563303037636239633037
+38396461613661376266313464613337656132393533353036353033656136343339633633323531
+66313962323235346563626562626461393532316236626238663631343531383932353837373836
+38633662633962653131323661653733663963313531383139626338313562306430323066353834
+36376133346464636239386264396366636532666162343731313030636565643837393133613838
+37336233363662313661366530353836363837666439656430616565363931306633333331633436
+61343231373063646534353530383738636230333861373037616335343532303364336566383061
+61666161653133656534306163393463356234613538323664353662393038386563613236353532
+37633639623432313330396532633364373061653838636565643365356463333632373236373435
+62663062613537336465663339343662613735383239346364323866643566663062396435333162
+66303134653037633537363833623832326532663865333235613539613265376330626430303330
+30393361393433383239353161363832346535633132336264363237356137313335333838636136
+31643533353934313935613463613665333430626635313235353336613966646562333037326130
+64336361643466316534386532393238646135393363336432386562646465383964373631333638
+64646432393065306335383565336366386338346239666463653331363261313835313432343561
+65306261376630626337353462323764323364613964333765633937316432353334666566643337
+63636139626463346336303035636563666238363863383232356134363634346439633664333131
+65313262653739613330353135373136643962313263353835313635306461633032366334663932
+66356362363035666430663664313366323438363864326236343065636138383336633531316631
+61613334613531393864306464363966383136663836373864373637626631303539643737396161
+37653666356238356338343939633363346538343131363864626230336232396430646436643266
+38613131356466343366303563303235366235396365383562633332633234646262383039653365
+65666435353439663939373936313966623166323563653161613261666565623037663562356661
+31353438336261613235656661636532396162616534663036343166653162663936366361656663
+35316236623739363439383337393666323362306463623462353533633638393336386432316430
+31343161303065313539633835636237386261366535656437383665636631663035326637373261
+61353834363231366335373163343337333861326132613438363339363461343862313538383366
+66363065313661303166623237653034626537643561613837616134386464626138363863356234
+62366163316132643332333930623037633062386334623766623234343061393236373830633932
+38613833346533383135306634303935633733383737373866633266363839353838363766323966
+65636538326330666663646435373665336561666261363134323363333436316431383662613361
+39306539346432653531303232616638633438386333336662663134373436623565646661306231
+66356262646231363438393333623034363131626436396538363832363830353865636530376463
+61383131663834646531613437313866356337623931336536373764396366636635376633316334
+35303430646432323530633231663363646436333264303462386433343939356630313564393530
+64356163353838633838613630393036373534303939376137383136396139633262393632396461
+34353865383365316163613234393865396266613336396266303631326632333936303137616135
+35383162346435376235336132373637376666623262663165623531613764376139656338633062
+38613730656337666164366535333134373937383338623330393935616339626133316363653930
+62626230663833346661346239633238663630323965333463323363333230383631353261303035
+65643963373162353537393333343534366335353339666461383138666261366531373664646134
+35663532366234373037616266303435353364356239353339383036323933323830623837336661
+64646165643039353066646635306138393633333430336535656635313165363230633466616466
+30333336326366623063323635363933333739376461313965656435393563616663656365393136
+64366363383239383261666134383536343532613335333837336131376565346463386633646461
+37383434393763376138363138343466303261383332323239323737613734646163313632653161
+39643963663738386463653366386461336633346462666530323038336337313531653730333037
+61633537353866366235633534613366366439646131613765623261343263373636343066616237
+36313163363032366635613634393036653132653137313763653432383632373265393635393630
+36356331623837373965666161356635333364356663666634663234613461656265643163333139
+33383262393138313235653139633066363238336466333030356630386462326634333966653831
+63363661623438646234313435383734333865353738363133393833643136323537363435333662
+35376563393932353330366366633062643039313965386539356638383864653362616439323161
+39326437356262663835613464393466383364373233313164666132303035333734353630353661
+38633636643132313533656163373064646439613138343164386233393136643164666336663264
+35613366383463396262613032373536663166333562626139316538633034613938653562303830
+61336233666661353634393030613139616638336637653361643133343364643230393564326166
+39636366623938363664633733323338313134383532636461316137623661653235376433353662
+63643165313431363935373837303564383133616663613533363137633336346230393361373233
+62326630313066373434633533626136383337336361616666653962353665653437376436653631
+32336262333538363732303136643839623037323261653939343435636435343431313862393434
+61356162666564373330623066303232626430626231393137353930613165363038
diff --git a/coreos-config/group_vars/testenv/rendering.yaml b/coreos-config/group_vars/testenv/rendering.yaml
deleted file mode 100644
index 4559d68..0000000
--- a/coreos-config/group_vars/testenv/rendering.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-render_blacklist:
-  - "03_syncthing/config/cert.pem"
-  - "03_syncthing/config/key.pem"
-  - "03_syncthing/config/config.xml"
diff --git a/coreos-config/inventory.yaml b/coreos-config/inventory.yaml
index bb6bf0d..e26e9aa 100644
--- a/coreos-config/inventory.yaml
+++ b/coreos-config/inventory.yaml
@@ -10,3 +10,6 @@ all:
     unprovisioned:
       hosts:
         # host.nc.chaoswg.org: null
+    backup:
+      hosts:
+        host.nc.chaoswg.org: null
diff --git a/coreos-config/playbook.yaml b/coreos-config/playbook.yaml
index cf2717e..82c266a 100644
--- a/coreos-config/playbook.yaml
+++ b/coreos-config/playbook.yaml
@@ -9,39 +9,8 @@
       timeout: 300
       sleep: 10
 
-- name: Render compose files
-  hosts: all
-  tags: template
-  vars:
-    render_path: "./render/{{ inventory_hostname }}/compose"
-  tasks:
-    - block:
-      - file:
-          state: absent
-          dest: '{{ render_path }}'
-        changed_when: false
-      - file:
-          state: directory
-          dest: '{{ render_path }}/{{ item.path }}'
-        changed_when: false
-        with_filetree: './compose'
-        loop_control:
-          label: '{{ item.path }}'
-        when: item.state == 'directory'
-      - name: Template Compose structure
-        ansible.builtin.template:
-          src: "{{ item.src }}"
-          dest: "{{ render_path }}/{{ item.path }}"
-          force: true
-        changed_when: false
-        with_filetree: './compose'
-        loop_control:
-          label: '{{ item.path }}'
-        when: item.state == 'file' and item.path not in render_blacklist
-      delegate_to: localhost
-
 - name: Backup
-  hosts: all
+  hosts: backup
   become: true
   become_user: root
   tasks:
@@ -75,12 +44,28 @@
   gather_facts: true
   tasks:
     - block:
-        - name: Install backup script
+        - name: Install restore script
           ansible.builtin.template:
             src: restore.sh.j2
             dest: /root/restore.sh
             mode: '0700'
             owner: root
+        - ansible.builtin.file:
+            path: /root/.ssh
+            owner: root
+            state: directory
+            mode: '0700'
+        - name: Install SSH Keys
+          ansible.builtin.template:
+            src: storagebox.j2
+            dest: /root/.ssh/storagebox
+            mode: '0600'
+            owner: root
+        - name: Add Known Hosts entries
+          ansible.builtin.known_hosts:
+            path: "/root/.ssh/known_hosts"
+            name: "{{ backup.known_hosts.name }}"
+            key: "{{ backup.known_hosts.key }}"
         - name: Restore from Borg
           become: true
           become_user: root
@@ -110,82 +95,27 @@
         mode: '0600'
         owner: core
 
-- name: Docker-Compose
-  hosts: all
-  tasks:
-    - name: Gather local Config
-      delegate_to: 127.0.0.1
-      find:
-        paths: "./render/{{ inventory_hostname }}/compose"
-        recurse: true
-        file_type: file
-      register: local_compose_files
-    - name: Gather Remote Config
-      find:
-        paths: /home/core/compose
-        recurse: true
-        file_type: file
-      register: remote_compose_files
-    - ansible.builtin.debug:
-        var: local_compose_files
-        verbosity: 2
-    - ansible.builtin.debug:
-        var: remote_compose_files
-        verbosity: 2
-
-    - ansible.builtin.set_fact:
-        compose_dirs_tainted: "{{ remote_compose_files.files | map(attribute='path') | difference(local_compose_files.files | map(attribute='path') | map('regex_replace', '^render/.*/compose', '/home/core/compose')) | map('dirname') }}"
-    - ansible.builtin.debug:
-        var: compose_dirs_tainted
-        verbosity: 2
-
-    - name: Stop tainted Compose Services
-      community.docker.docker_compose:
-        project_src: "{{ item }}"
-        state: absent
-      loop: "{{ compose_dirs_tainted }}"
-
-    - name: Copy Compose files
-      become: true
-      ansible.posix.synchronize:
-        src: "./render/{{ inventory_hostname }}/compose"
-        dest: /home/core/
-        archive: false
-        checksum: true
-        delete: true
-        recursive: true
-        mode: push
-        owner: false
-        group: false
-        perms: false
-      register: compose_files
-
-    - ansible.builtin.debug:
-        var: compose_files
-        verbosity: 2
-
-    - name: Restart Compose projects
-      vars:
-        docker_restart: "{{ lookup('env', 'DOCKER_RESTART') | default('false', true) | bool }}"
-      block:
-        - find:
-            paths: /home/core/compose
-            recurse: false
-            file_type: directory
-          register: compose_directories
-        - ansible.builtin.debug:
-            var: compose_directories
-            verbosity: 2
-        - name: Restart Compose Projects
-          community.docker.docker_compose:
-            project_src: "{{ item }}"
-            state: present
-            restarted: true
-            recreate: smart
-            build: true
-            remove_orphans: true
-          loop: "{{ compose_directories.files | map(attribute='path') | sort }}"
-      when: compose_files.changed or docker_restart
 
+- name: Install Services
+  hosts: host.nc.chaoswg.org
+  roles:
+    - { role: compose_project, service: traefik }
+    - { role: compose_project, service: keycloak }
+    - { role: compose_project, service: minio }
+    - { role: compose_project, service: registry }
+    - { role: compose_project, service: gitea }
+    - { role: compose_project, service: wireguard }
+    - { role: compose_project, service: hedgedoc }
+    - { role: compose_project, service: miniflux }
+    - { role: compose_project, service: nextcloud }
+    - { role: compose_project, service: search }
+    - { role: compose_project, service: syncthing }
+    - { role: compose_project, service: blog }
+    - { role: compose_project, service: caddy }
+    - { role: compose_project, service: diun }
+    - { role: compose_project, service: thelounge }
+    - { role: compose_project, service: tubearchivist }
+    - { role: compose_project, service: watchtower }
+    - { role: compose_project, service: youtrack }
 
 ...
diff --git a/coreos-config/roles/compose_project/README.md b/coreos-config/roles/compose_project/README.md
new file mode 100644
index 0000000..f03d0c6
--- /dev/null
+++ b/coreos-config/roles/compose_project/README.md
@@ -0,0 +1,38 @@
+compose_project
+=========
+
+Helps you deploy and update a remote docker-compose project.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+`service`: name of the service to be deployed. Currently part of the role templates.
+
+`compose_dir`: Directory which contains all compose services on the target
+
+Dependencies
+------------
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: compose_project, service: traefik }
+         - { role: compose_project, service: nextcloud }
+
+License
+-------
+
+MIT
+
+Author Information
+------------------
diff --git a/coreos-config/roles/compose_project/defaults/main.yml b/coreos-config/roles/compose_project/defaults/main.yml
new file mode 100644
index 0000000..8af830a
--- /dev/null
+++ b/coreos-config/roles/compose_project/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# defaults file for roles/compose_project
+service: dummy
+compose_dir: /home/core/compose
diff --git a/coreos-config/roles/compose_project/handlers/main.yml b/coreos-config/roles/compose_project/handlers/main.yml
new file mode 100644
index 0000000..a81635b
--- /dev/null
+++ b/coreos-config/roles/compose_project/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for roles/compose_project
diff --git a/coreos-config/roles/compose_project/meta/main.yml b/coreos-config/roles/compose_project/meta/main.yml
new file mode 100644
index 0000000..7f827d5
--- /dev/null
+++ b/coreos-config/roles/compose_project/meta/main.yml
@@ -0,0 +1,52 @@
+galaxy_info:
+  author: Tobias Manske
+  description: Deploys a docker compose directory and restarts on change
+  company: null
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: MIT
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/coreos-config/roles/compose_project/tasks/main.yml b/coreos-config/roles/compose_project/tasks/main.yml
new file mode 100644
index 0000000..eaa9678
--- /dev/null
+++ b/coreos-config/roles/compose_project/tasks/main.yml
@@ -0,0 +1,75 @@
+---
+
+- name: Set service_dir
+  ansible.builtin.set_fact:
+    service_dir: "{{ compose_dir | mandatory }}/{{ service | mandatory }}"
+    cacheable: true
+
+- ansible.builtin.debug:
+    msg: "Working on {{ service }}"
+    verbosity: 0
+
+- block:
+  - name: Create Temporary directory
+    tempfile: state=directory
+    changed_when: false
+    register: temp_file
+  - name: Create directory structure
+    file:
+      state: directory
+      dest: '{{ temp_file.path }}/{{ item.path }}'
+      mode: "{{ item.mode }}"
+    changed_when: false
+    with_filetree: "./templates/{{ service | mandatory }}"
+    when: item.state == 'directory'
+    loop_control:
+      label: '{{ item.path }}'
+  - name: Template Service Files
+    ansible.builtin.template:
+      src: "{{ item.src }}"
+      dest: "{{ temp_file.path }}/{{ item.path }}"
+      mode: "{{ item.mode }}"
+      force: true
+    changed_when: false
+    with_filetree: "./templates/{{ service | mandatory }}"
+    loop_control:
+      label: '{{ item.path }}'
+    when: item.state == 'file'
+  delegate_to: localhost
+
+- name: Create Service Directory
+  file:
+    state: directory
+    path: "{{ compose_dir | mandatory }}"
+
+- name: Copy Compose files
+  become: false
+  ansible.posix.synchronize:
+    src: "{{ temp_file.path | mandatory }}/"
+    dest: "{{ service_dir | mandatory }}"
+    archive: false
+    checksum: true
+    delete: true
+    recursive: true
+    mode: push
+    owner: false
+    group: false
+    perms: false
+  register: compose_files
+
+- name: Delete temporary directory
+  ansible.builtin.file:
+    path: "{{ temp_file.path }}"
+    state: absent
+  changed_when: false
+
+- name: Restart Service
+  community.docker.docker_compose:
+    project_src: "{{ service_dir | mandatory }}"
+    state: present
+    restarted: true
+    recreate: smart
+    build: true
+    remove_orphans: true
+  when: compose_files.changed
+...
diff --git a/coreos-config/compose/04_blog/.env b/coreos-config/roles/compose_project/templates/blog/.env
similarity index 100%
rename from coreos-config/compose/04_blog/.env
rename to coreos-config/roles/compose_project/templates/blog/.env
diff --git a/coreos-config/compose/04_blog/docker-compose.yaml b/coreos-config/roles/compose_project/templates/blog/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/04_blog/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/blog/docker-compose.yaml
diff --git a/coreos-config/compose/05_caddy/.env b/coreos-config/roles/compose_project/templates/caddy/.env
similarity index 100%
rename from coreos-config/compose/05_caddy/.env
rename to coreos-config/roles/compose_project/templates/caddy/.env
diff --git a/coreos-config/compose/05_caddy/Caddyfile b/coreos-config/roles/compose_project/templates/caddy/Caddyfile
similarity index 100%
rename from coreos-config/compose/05_caddy/Caddyfile
rename to coreos-config/roles/compose_project/templates/caddy/Caddyfile
diff --git a/coreos-config/compose/05_caddy/docker-compose.yaml b/coreos-config/roles/compose_project/templates/caddy/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_caddy/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/caddy/docker-compose.yaml
diff --git a/coreos-config/compose/05_diun/.env b/coreos-config/roles/compose_project/templates/diun/.env
similarity index 100%
rename from coreos-config/compose/05_diun/.env
rename to coreos-config/roles/compose_project/templates/diun/.env
diff --git a/coreos-config/compose/05_diun/diun.yml b/coreos-config/roles/compose_project/templates/diun/diun.yml
similarity index 100%
rename from coreos-config/compose/05_diun/diun.yml
rename to coreos-config/roles/compose_project/templates/diun/diun.yml
diff --git a/coreos-config/compose/05_diun/docker-compose.yaml b/coreos-config/roles/compose_project/templates/diun/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_diun/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/diun/docker-compose.yaml
diff --git a/coreos-config/compose/05_diun/watch.yml b/coreos-config/roles/compose_project/templates/diun/watch.yml
similarity index 100%
rename from coreos-config/compose/05_diun/watch.yml
rename to coreos-config/roles/compose_project/templates/diun/watch.yml
diff --git a/coreos-config/compose/02_gitea/.env b/coreos-config/roles/compose_project/templates/gitea/.env
similarity index 100%
rename from coreos-config/compose/02_gitea/.env
rename to coreos-config/roles/compose_project/templates/gitea/.env
diff --git a/coreos-config/compose/02_gitea/docker-compose.yaml b/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
similarity index 95%
rename from coreos-config/compose/02_gitea/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
index a9dd42f..0e547d4 100644
--- a/coreos-config/compose/02_gitea/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
@@ -39,9 +39,9 @@ services:
     image: postgres:14
     restart: always
     environment:
-      - POSTGRES_USER="{{ gitea.db.user }}"
-      - POSTGRES_PASSWORD="{{ gitea.db.password }}"
-      - POSTGRES_DB="{{ gitea.db.name }}"
+      - "POSTGRES_USER={{ gitea.db.user }}"
+      - "POSTGRES_PASSWORD={{ gitea.db.password }}"
+      - "POSTGRES_DB={{ gitea.db.name }}"
     networks:
       - backend
     volumes:
diff --git a/coreos-config/compose/03_hedgedoc/.env b/coreos-config/roles/compose_project/templates/hedgedoc/.env
similarity index 100%
rename from coreos-config/compose/03_hedgedoc/.env
rename to coreos-config/roles/compose_project/templates/hedgedoc/.env
diff --git a/coreos-config/compose/03_hedgedoc/docker-compose.yaml b/coreos-config/roles/compose_project/templates/hedgedoc/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/03_hedgedoc/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/hedgedoc/docker-compose.yaml
diff --git a/coreos-config/compose/01_keycloak/.env b/coreos-config/roles/compose_project/templates/keycloak/.env
similarity index 100%
rename from coreos-config/compose/01_keycloak/.env
rename to coreos-config/roles/compose_project/templates/keycloak/.env
diff --git a/coreos-config/compose/01_keycloak/docker-compose.yaml b/coreos-config/roles/compose_project/templates/keycloak/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/01_keycloak/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/keycloak/docker-compose.yaml
diff --git a/coreos-config/compose/03_miniflux/.env b/coreos-config/roles/compose_project/templates/miniflux/.env
similarity index 100%
rename from coreos-config/compose/03_miniflux/.env
rename to coreos-config/roles/compose_project/templates/miniflux/.env
diff --git a/coreos-config/compose/03_miniflux/docker-compose.yaml b/coreos-config/roles/compose_project/templates/miniflux/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/03_miniflux/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/miniflux/docker-compose.yaml
diff --git a/coreos-config/compose/01_minio/.env b/coreos-config/roles/compose_project/templates/minio/.env
similarity index 100%
rename from coreos-config/compose/01_minio/.env
rename to coreos-config/roles/compose_project/templates/minio/.env
diff --git a/coreos-config/compose/01_minio/docker-compose.yaml b/coreos-config/roles/compose_project/templates/minio/docker-compose.yaml
similarity index 89%
rename from coreos-config/compose/01_minio/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/minio/docker-compose.yaml
index 757d176..8fb1066 100644
--- a/coreos-config/compose/01_minio/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/minio/docker-compose.yaml
@@ -19,10 +19,12 @@ services:
       - "traefik.http.routers.minio.rule=Host(`${MINIO_URL}`)"
       - "traefik.http.routers.minio.entryPoints=websecure"
       - "traefik.http.services.minio.loadbalancer.server.port=9000"
+      - "traefik.http.routers.minio.service=minio"
       - "traefik.http.routers.minio-dashboard.rule=Host(`${DASHBOARD_URL}`)"
       - "traefik.http.routers.minio-dashboard.entryPoints=websecure"
       - "traefik.http.routers.minio-dashboard.middlewares=sso@file"
       - "traefik.http.services.minio-dashboard.loadbalancer.server.port=9001"
+      - "traefik.http.routers.minio-dashboard.service=minio-dashboard"
     command: "server /data --console-address ':9001' --anonymous"
 
 
diff --git a/coreos-config/compose/03_nextcloud/.env b/coreos-config/roles/compose_project/templates/nextcloud/.env
similarity index 100%
rename from coreos-config/compose/03_nextcloud/.env
rename to coreos-config/roles/compose_project/templates/nextcloud/.env
diff --git a/coreos-config/compose/03_nextcloud/config.php b/coreos-config/roles/compose_project/templates/nextcloud/config.php
similarity index 100%
rename from coreos-config/compose/03_nextcloud/config.php
rename to coreos-config/roles/compose_project/templates/nextcloud/config.php
diff --git a/coreos-config/compose/03_nextcloud/docker-compose.yaml b/coreos-config/roles/compose_project/templates/nextcloud/docker-compose.yaml
similarity index 96%
rename from coreos-config/compose/03_nextcloud/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/nextcloud/docker-compose.yaml
index 000aed7..1426c8e 100644
--- a/coreos-config/compose/03_nextcloud/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/nextcloud/docker-compose.yaml
@@ -19,10 +19,10 @@ services:
   app:
     image: registry.tobiasmanske.de/nextcloud:main
     restart: always
-    links:
+    depends_on:
       - db
     volumes:
-      - ./config.php:/var/www/html/config/config.php:Z
+      - ./config.php:/config.php:ro,Z
       - nc_custom_apps:/var/www/html/custom_apps
       - nc_data:/var/www/data
     environment:
diff --git a/coreos-config/compose/01_registry/.env b/coreos-config/roles/compose_project/templates/registry/.env
similarity index 100%
rename from coreos-config/compose/01_registry/.env
rename to coreos-config/roles/compose_project/templates/registry/.env
diff --git a/coreos-config/compose/01_registry/config.yaml b/coreos-config/roles/compose_project/templates/registry/config.yaml
similarity index 100%
rename from coreos-config/compose/01_registry/config.yaml
rename to coreos-config/roles/compose_project/templates/registry/config.yaml
diff --git a/coreos-config/compose/01_registry/docker-compose.yaml b/coreos-config/roles/compose_project/templates/registry/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/01_registry/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/registry/docker-compose.yaml
diff --git a/coreos-config/compose/01_registry/htpasswd b/coreos-config/roles/compose_project/templates/registry/htpasswd
similarity index 100%
rename from coreos-config/compose/01_registry/htpasswd
rename to coreos-config/roles/compose_project/templates/registry/htpasswd
diff --git a/coreos-config/compose/03_search/.env b/coreos-config/roles/compose_project/templates/search/.env
similarity index 100%
rename from coreos-config/compose/03_search/.env
rename to coreos-config/roles/compose_project/templates/search/.env
diff --git a/coreos-config/compose/03_search/docker-compose.yaml b/coreos-config/roles/compose_project/templates/search/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/03_search/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/search/docker-compose.yaml
diff --git a/coreos-config/compose/03_search/settings.yml b/coreos-config/roles/compose_project/templates/search/settings.yml
similarity index 100%
rename from coreos-config/compose/03_search/settings.yml
rename to coreos-config/roles/compose_project/templates/search/settings.yml
diff --git a/coreos-config/compose/03_search/uwsgi.ini b/coreos-config/roles/compose_project/templates/search/uwsgi.ini
similarity index 100%
rename from coreos-config/compose/03_search/uwsgi.ini
rename to coreos-config/roles/compose_project/templates/search/uwsgi.ini
diff --git a/coreos-config/compose/03_syncthing/.env b/coreos-config/roles/compose_project/templates/syncthing/.env
similarity index 100%
rename from coreos-config/compose/03_syncthing/.env
rename to coreos-config/roles/compose_project/templates/syncthing/.env
diff --git a/coreos-config/compose/03_syncthing/config/cert.pem b/coreos-config/roles/compose_project/templates/syncthing/config/cert.pem
similarity index 100%
rename from coreos-config/compose/03_syncthing/config/cert.pem
rename to coreos-config/roles/compose_project/templates/syncthing/config/cert.pem
diff --git a/coreos-config/compose/03_syncthing/config/config.xml b/coreos-config/roles/compose_project/templates/syncthing/config/config.xml
similarity index 100%
rename from coreos-config/compose/03_syncthing/config/config.xml
rename to coreos-config/roles/compose_project/templates/syncthing/config/config.xml
diff --git a/coreos-config/compose/03_syncthing/config/key.pem b/coreos-config/roles/compose_project/templates/syncthing/config/key.pem
similarity index 100%
rename from coreos-config/compose/03_syncthing/config/key.pem
rename to coreos-config/roles/compose_project/templates/syncthing/config/key.pem
diff --git a/coreos-config/compose/03_syncthing/docker-compose.yaml b/coreos-config/roles/compose_project/templates/syncthing/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/03_syncthing/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/syncthing/docker-compose.yaml
diff --git a/coreos-config/compose/05_thelounge/.env b/coreos-config/roles/compose_project/templates/thelounge/.env
similarity index 100%
rename from coreos-config/compose/05_thelounge/.env
rename to coreos-config/roles/compose_project/templates/thelounge/.env
diff --git a/coreos-config/compose/05_thelounge/docker-compose.yaml b/coreos-config/roles/compose_project/templates/thelounge/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_thelounge/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/thelounge/docker-compose.yaml
diff --git a/coreos-config/compose/00_traefik/.env b/coreos-config/roles/compose_project/templates/traefik/.env
similarity index 100%
rename from coreos-config/compose/00_traefik/.env
rename to coreos-config/roles/compose_project/templates/traefik/.env
diff --git a/coreos-config/compose/00_traefik/docker-compose.yaml b/coreos-config/roles/compose_project/templates/traefik/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/00_traefik/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/traefik/docker-compose.yaml
diff --git a/coreos-config/compose/00_traefik/dynamic.yaml b/coreos-config/roles/compose_project/templates/traefik/dynamic.yaml
similarity index 100%
rename from coreos-config/compose/00_traefik/dynamic.yaml
rename to coreos-config/roles/compose_project/templates/traefik/dynamic.yaml
diff --git a/coreos-config/compose/00_traefik/traefik-fa.ini b/coreos-config/roles/compose_project/templates/traefik/traefik-fa.ini
similarity index 100%
rename from coreos-config/compose/00_traefik/traefik-fa.ini
rename to coreos-config/roles/compose_project/templates/traefik/traefik-fa.ini
diff --git a/coreos-config/compose/00_traefik/traefik.yaml b/coreos-config/roles/compose_project/templates/traefik/traefik.yaml
similarity index 100%
rename from coreos-config/compose/00_traefik/traefik.yaml
rename to coreos-config/roles/compose_project/templates/traefik/traefik.yaml
diff --git a/coreos-config/compose/05_tubearchivist/.env b/coreos-config/roles/compose_project/templates/tubearchivist/.env
similarity index 100%
rename from coreos-config/compose/05_tubearchivist/.env
rename to coreos-config/roles/compose_project/templates/tubearchivist/.env
diff --git a/coreos-config/compose/05_tubearchivist/docker-compose.yaml b/coreos-config/roles/compose_project/templates/tubearchivist/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_tubearchivist/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/tubearchivist/docker-compose.yaml
diff --git a/coreos-config/compose/05_watchtower/.env b/coreos-config/roles/compose_project/templates/watchtower/.env
similarity index 100%
rename from coreos-config/compose/05_watchtower/.env
rename to coreos-config/roles/compose_project/templates/watchtower/.env
diff --git a/coreos-config/compose/05_watchtower/docker-compose.yaml b/coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_watchtower/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml
diff --git a/coreos-config/compose/02_wireguard/.env b/coreos-config/roles/compose_project/templates/wireguard/.env
similarity index 100%
rename from coreos-config/compose/02_wireguard/.env
rename to coreos-config/roles/compose_project/templates/wireguard/.env
diff --git a/coreos-config/compose/02_wireguard/docker-compose.yaml b/coreos-config/roles/compose_project/templates/wireguard/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/02_wireguard/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/wireguard/docker-compose.yaml
diff --git a/coreos-config/compose/02_wireguard/wg0.conf b/coreos-config/roles/compose_project/templates/wireguard/wg0.conf
similarity index 100%
rename from coreos-config/compose/02_wireguard/wg0.conf
rename to coreos-config/roles/compose_project/templates/wireguard/wg0.conf
diff --git a/coreos-config/compose/05_youtrack/.env b/coreos-config/roles/compose_project/templates/youtrack/.env
similarity index 100%
rename from coreos-config/compose/05_youtrack/.env
rename to coreos-config/roles/compose_project/templates/youtrack/.env
diff --git a/coreos-config/compose/05_youtrack/docker-compose.yaml b/coreos-config/roles/compose_project/templates/youtrack/docker-compose.yaml
similarity index 100%
rename from coreos-config/compose/05_youtrack/docker-compose.yaml
rename to coreos-config/roles/compose_project/templates/youtrack/docker-compose.yaml
diff --git a/coreos-config/roles/compose_project/tests/inventory b/coreos-config/roles/compose_project/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/coreos-config/roles/compose_project/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/coreos-config/roles/compose_project/tests/test.yml b/coreos-config/roles/compose_project/tests/test.yml
new file mode 100644
index 0000000..1011e2e
--- /dev/null
+++ b/coreos-config/roles/compose_project/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - roles/compose_project
diff --git a/coreos-config/roles/compose_project/vars/main.yml b/coreos-config/roles/compose_project/vars/main.yml
new file mode 100644
index 0000000..965845f
--- /dev/null
+++ b/coreos-config/roles/compose_project/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for roles/compose_project
diff --git a/coreos-config/templates/backup.sh.j2 b/coreos-config/templates/backup.sh.j2
index 5db2795..8bdd34e 100755
--- a/coreos-config/templates/backup.sh.j2
+++ b/coreos-config/templates/backup.sh.j2
@@ -29,10 +29,9 @@ borg create                         \
     --compression lz4               \
     --exclude-caches                \
     --one-file-system		        \
-    --exclude "re:^/var/lib/docker/volumes/[a-z0-9]{64}/.*"   \
     --exclude "re:^/var/lib/docker/volumes/nobackup_.*"   \
     ::'{hostname}-{now}'            \
-    /var/lib/docker/volumes
+    /var/lib/docker
 
 backup_exit=$?
 
diff --git a/coreos-config/templates/restore.sh.j2 b/coreos-config/templates/restore.sh.j2
index 52d6468..09f461d 100755
--- a/coreos-config/templates/restore.sh.j2
+++ b/coreos-config/templates/restore.sh.j2
@@ -30,7 +30,6 @@ cd /
 
 borg extract \
     --list \
-    --exclude "re:^/var/lib/docker/volumes/[a-z0-9]{64}/.*"   \
     "::${RESTORE_FROM}"
 
 
diff --git a/restore-tests/Makefile b/restore-tests/Makefile
index 0b1a694..0e375de 100644
--- a/restore-tests/Makefile
+++ b/restore-tests/Makefile
@@ -1,4 +1,4 @@
 all: artifacts/release/coreos-installer
 
 artifacts/release/coreos-installer:
-	docker run --rm -v "${PWD}/artifacts:/artifacts" clux/muslrust:stable cargo install --bin=coreos-installer --target=x86_64-unknown-linux-musl --root=/artifacts coreos-installer --force
+	docker run --rm -v "${PWD}/artifacts:/artifacts" rust:1-bullseye sh -c "apt-get update && apt-get install -y build-essential libssl-dev libzstd-dev pkg-config && cargo install --bin=coreos-installer --target=x86_64-unknown-linux-gnu --root=/artifacts coreos-installer --force"