Automated template extraction

2025-11-21 08:05:44 +00:00
70 changed files with 1478 additions and 1811 deletions
--- a/.gitea/workflows/deploy-all.yml
+++ b/.gitea/workflows/deploy-all.yml
@@ -6,7 +6,7 @@ on:
 jobs:
  deploy:
    name: Prepare
-    runs-on: ansible
+    runs-on: runner
    steps:
      - name: Checkout Repo
        uses: actions/checkout@v4
@@ -14,7 +14,6 @@ jobs:
          fetch-depth: 0

      - name: Deploy
-        shell: sh
        run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
@@ -24,4 +23,4 @@ jobs:
          echo "HOST *" > ~/.ssh/config
          echo "${{ secrets.VAULT_PASS }}" > ~/.vault_pass.txt
          chmod 600 ansible.cfg 
-          /usr/bin/ansible-playbook main.yml -l jackson --vault-password-file ~/.vault_pass.txt
+          /usr/bin/ansible-playbook main.yml --vault-password-file ~/.vault_pass.txt
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -8,7 +8,7 @@ on:
 jobs:
  deploy:
    name: Prepare
-    runs-on: ansible
+    runs-on: runner
    steps:
      - name: Checkout Repo
        uses: actions/checkout@v4
@@ -16,7 +16,6 @@ jobs:
          fetch-depth: 0

      - name: Deploy
-        shell: sh
        run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
--- a/.gitea/workflows/update.yml
+++ b/.gitea/workflows/update.yml
@@ -6,7 +6,7 @@ on:
 jobs:
  run-update:
    name: Run update script
-    runs-on: ubuntu-latest
+    runs-on: runner
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
--- a/.gitea/workflows/write-new-template.yml
+++ b/.gitea/workflows/write-new-template.yml
@@ -6,7 +6,7 @@ on:
 jobs:
  create-pr:
    name: Extract updated template
-    runs-on: ubuntu-latest
+    runs-on: runner
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
--- a/host_vars/all.template.yml
+++ b/host_vars/all.template.yml
@@ -4,8 +4,6 @@ docker_network_name:
 TZ:
 PUID:
 PGID:
-ansible_become_pass:
-media_path:

 # api
 API_CONTACT_WEBHOOK:
@@ -54,6 +52,14 @@ MASTODON_ARE_PRIMARY:
 # wings
 WINGS_URL:
 WINGS_CONTAINER_DIR:
+media_path:
+
+# frigate
+FRIGATE_RECORDINGS_PATH:
+
+# plex
+PLEX_CLAIM_TOKEN:
+ansible_become_pass:

 # glance
 GLANCE_PIHOLE_TOKEN:
@@ -168,9 +174,3 @@ HELIUM_EXT_HMAC_SECRET:
 PTERODACTYL_APP_URL:
 PTERODACTYL_MYSQL_PASSWORD:
 PTERODACTYL_MYSQL_ROOT_PASSWORD:
-
-# frigate
-FRIGATE_RECORDINGS_PATH:
-
-# plex
-PLEX_CLAIM_TOKEN:
--- a/host_vars/ash-1.yml
+++ b/host_vars/ash-1.yml
@@ -1,20 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-63396333353166316666616661613532383538393239303966633336363361613332343437376566
-3265326538643839326262386165623639353130656164320a323536333037353664646163386335
-33336631303336616636343538353865383531316561623166323762396262643930376231616638
-6638613961313364390a366564343030633665646666626165383334356364623761383032633963
-39393264353635626539393831323530366630343665623561653836303065633965316163386166
-63353836333639363765616164383133623330653762333762623632653535623438313831653365
-32393732306135323062666539663839656563306133393031643766626666323534626638653236
-63613832333833626439653034366336633534323131356262396138373938383039336263356531
-36323432653634366365663039336231343239626539393961636562366263653934613333633535
-61613937336336323135376663336364386533366537626133316130353862633862336530633339
-33663439663332653461643839353564333765646537363864653765303933393562383134316434
-38333134646362663837653461646661633539623734316635383163313363653730653763326262
-65326365383661306466663930646162343033383932633866383862626339366631633862346334
-36366161636663653136383439333461366264383533346461613631623730326437376537373638
-64323863333364613039613533393232373162346436613864336237336439353134313361653634
-64366663303265386663623139636131383432343238306631333436373939393832616262393232
-33376466613639396436396166363032653434653730643734356432653063303762333230323431
-34313338303838346466666463376636323433663038363935633362656164383762343531633563
-386432323237313039376531653362326337
--- a/host_vars/bear.yml
+++ b/host_vars/bear.yml
@@ -1,233 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35636464336130336363363961663963393561333135326165613837356661336432353837626633
-6663643331326636393233663737353732313230663766650a386364376331353165356462613761
-35643465303439333637626132346236613234393731363562616138323864313864326438373036
-6630346663633563320a303534646534623431306663346131306161373761666636333732343131
-64363334376263653666303363373764343037663763643661333633303139393464353537333963
-61376266396161313832363466316165393836303561656331356432353830356631386136626633
-37396564623865333635353536663766346434373131646434396131633035393665313465613162
-34643939366465343331383235363966323130346230663232323265613066346466643434323939
-63613831303839316136326132363663653539363331383239613036363634313936646234343961
-38633330363464363836663061666666656336666232356433343339346635643862613636373365
-64306165666537366165313035393536353330616164373361613832653137326230613833393737
-33323664636563653463363062343035643736376435303234613233356437353662303639393935
-39313065623861633435376335303364633065393535316630623331623139376231373164376264
-39656234656339333635666566343230336532356438383531343139376365653637646265313239
-37323331326235313234306635376235336233623032383532373537376234663632336438613331
-63623862326635653536306461653663323764346434306164616435356233323732613439643364
-35643966623566396234313536323037623961613563653362636337393138313439646135623965
-63393132356533616635376564363634623766333066386162656661376539343939326561613764
-39633635363165336363373435393463326533333734303863363562346365383635383039613863
-35623335393864623131376461643465306463356435643835626532343137343734316433316631
-65623163376330356338623830326130326661383533303166623636636663646566653265396262
-39376564313536653538666363616662353639373162633161656530346232333930303464363138
-64373930373565386337306535383433613265613137336631343832336333623433373834643338
-34383037643833616330363838343734633131666166343839636565356638366639323761613237
-39653532343466646335636264636564376465633630343361353239643761326561396633363864
-36623330383434396330663066333262383665626230633531623134643161616664306332323761
-63316533623836623436313930383565363163663633646330333734373663616637343933333239
-65653161666536386631343930353463663635326665383666316538333436373632666631313432
-37336365343739383365363634313032633134383938633631363665633433653064363538393931
-35663765343866633431663733663334623939613962366664663738356566343031653239343663
-66613666343862343939643435396133623364646337383363356131356163313537326465613131
-64323363313165663936396262383330643463373930393564656235313231303766643032373965
-63636563363036383663356363663132346639666330363335306530363433613236663430643837
-61346665613033303036373336613632363263303965363463656334366530643162326162343533
-61343137303362663066306238343638336236336363346163323661326439306261373634663634
-61626236323464333430336339343931656365303864373033396134613133396432636531646630
-35663437353737646334333761613430346265666266353035643235316533616665626137316536
-31386266363439653864646462623637643666346661336136396662643236376331653439336136
-64386134643038626335633562616166623834636433626532323636663733333632393833336263
-34636635646361616364326666666130373930356534336639663061396631613266656230306234
-36616663313633383362353166646433353936363337623130636336663134666439396630663662
-33373334396131343530396335363533626333633138323632643566616533346163396330626430
-37636166636330643662393533373264353666343032646431303833616563363139303066343434
-36623139633736653633366433336262373962633431653166653437393337323631303835653365
-34616434356438366635376430623462353062386337643663343362336665336136656530616530
-38306536393163643630343532653235326662653764623633323430643438383131313363303965
-34333561383334373164653833646638343232643536666431666661346261333431623937373765
-64313839366436646332666331333438646261643064653339353936343837376161626635656134
-62623038383238646166383137333931623430303833393938396334616536366465616262663833
-61343365653861323139326335653534636361653636346239623035316237356164393462393437
-31643162323536323966323831626366666336383039643236663465653638653531376535376537
-37346136626237643062336161373532376336336535633130663365613939393264653562306434
-39303030323563373232346537336131613637633566633465396334383637386466316465363536
-32396432333431663439363062303161353531353235626530316430663064663438353164626165
-32613161313739376332643738383061613734643437623736303562623437343766613137663434
-64366235303236383834346164346637383433323938626534623438656533656135333332653031
-63343436666361353766346662666234616232666630376130376530306639373166333462356435
-37393639616161366565613036333437643762343438333863346433356132376533386363333334
-37316365313465336637326230623462316637633737663934623831653063356564613164666236
-62616139393335366538626636316165353161663632663832396564393163346161353439313932
-32303265343731363061626631353335666236386362386161643162333862376431386566326666
-39626532643264303630616436666633613366316136373434363063663766383732646464336464
-63343038303437636637306365636535373438653336306565383133376235646330613432353034
-62376634633630656239613261646362393261343061353734383330313765363163616430313365
-33663065386461633734666136633832353461313363313066393062613661313134343761626530
-32326138373239393236336434373831353666623937383765313938383434303461666139663537
-66616638386266353734656234373233313065626633333133656130313934396231343165366464
-65656539646437343835313661613963356335353431363936383038373233306161653037313131
-65346638396563626231653466323335383732323362633538373366363262343632666635333730
-37363963363538613438316531363266366231393861353333313034396533653563646465616162
-32643238666531393264346133323363666265636563336534666530643264306437656232356661
-62363935316364636536333630356232386437373938646431323339346237613134633533316634
-66663763643535323535623961353539626364623432323638333063643162613462373132386439
-38333565346538356163333034323439313965633336613563363936356232323038363034623931
-66633763353736343833373137323031623134633164393865653739643261366433373838626561
-39313866646633326433363232643965616439636261343436626637616463393933383537613564
-37663733323861383134656634323831633864613435653266366435303933613138303939623031
-66326263613334353836396134623232666233336534363561303230646661616666613737346336
-39356261303937643936313333643864663532613466393738353439366662313638613366396363
-36623032616665383465633937383965383332313936313263393963616137313639336563356163
-35633133316438393265333561643263323562623939373032643931313163303465356132653234
-36663236316466353331333165656337383666326564646134313261376362633161626339353730
-37393666373932303964656533656261353865643838313939303464343732346364613737623334
-62333033646663666662663238623531353332313130646334646534656632306163343562643136
-35663362303634363836643233613263346530326439333933366234643261326665363462656165
-32353562326136363265623162336630653332326631653332656531363937663630653630313930
-37616666396165636664356137316562396131383830616336636563333935663266626261613036
-39613234313138376565333533616366636336396237643535336436323734633065313937646634
-34346336386362393637333234636633656131613661653866616133666262313930323465623031
-36383539613761353064643034646435356135383731366263656264323138363964653664653166
-34626463343634666362643333653866616433656366623635666363336363383538626631613163
-31646535303563636565366638366535613061653162353265346533633562306230366132396633
-65306664646465363034643230306363646565356162383261343834626366396539386331663065
-62363532653530326134343230633766663562373339626433323563366264333237633731626663
-35333463376133636364343530613134373566643233353738396136663930613932393066316434
-64363261323763333763323866323364376531646434373839323739343463623536653164343034
-30323338346633646663643435643536373562363239323966656131316161313132326334356537
-34313739613831613664393362393464383763316130666331646165393966393033306639623238
-38393266333238393934653661633737316436633765363563343531376561303361333536343833
-31643739326664373431663034383137396239393163333061313431626135386262383030396666
-61623035326262326163636439373138656235333338363935663830383562313262646432316537
-62623734313132396438373136666333313961326164376563353534643966393965363861643239
-62346433653634343466316664336564303936353263303038653861326263386335396166333763
-38666539346435643632303537626337363232326538383835393030363132386135306463386465
-34633632663665626235643332663736323031346263633733306563626434643866306466303966
-65656364616238323835383561326461363038363238373634653962663839663563623266393732
-66386464376361663635373731646364393333306236333630663334646364383736303664646638
-33306532303337313436353034306637396639323132626230316537626530336330656566643734
-66323664396132616435336537353739383065613737316365656336613433383630313561656432
-61393536353634656637346639373461356339323135623663633233646334646439663930306330
-39333132623232326431613139383061323336313936366662613030323732613036386436616238
-38316133653134326137333634636336333564623135363064333063323232393265376430643461
-36343233653630313262653434666262353065643139323530373235663333336638333638306539
-63626632653535386438356232356439636464366537306239313663613065646165633039316236
-33343834636533656330656663376664376139363564393866356666333234623161613365666430
-66336363373132353666663562383330383464623865326237366562623062363933613863643739
-39396631363166326239346131633762353937323537333562626338326363313733306530366234
-63663039616538633366316664643366346632393733323166323163373361613966363335333366
-36366136393534363165383035336239356661666164333761353537373233306139313132313061
-34633637663338353966376164623635633039643934356436366630313362363562633837303436
-62663333666138616336353532333936663939633261656139653431346232633064303038363131
-30386230373733616234373335623336306437656539326462386463653537353539616233393332
-36383663316537653639666666393238663536633133373134346333343137393338623466313163
-62656461613134633861643235383836343832643364663636626166616661306134623530396639
-62383634373639633566363934373734343961653339313537373864353664656263366562323566
-37313464343763336666613062643831663234346264376265303761633035643062643934613631
-34613462383464626638366665393861366439313236666231663230393839323630626132363664
-33333066623632303636353164666434656435353764393666653638376133346539646564636162
-38613338663566616132306536353266306666653864383730323133366637623661366634373239
-30663732353639393839666163323164346166333465643234633330323864653930666538373431
-32633437353736353134346535383536656538316439643036366536313139396231663836386561
-65373033356566333564356334373366376436633335623661356436396639613731643065613966
-38393839303865336365356163356532316131663731626335336365393337306530633133616530
-30383332396237353834613731653033343665356539613037323833373132333264633762303537
-37353665343166653731373066633765633732656233636539393663393033303532663135653730
-63303665623061326161626363316638373864343539623761316135373263386139386231643364
-30646230323338623463303861363136613933313138323834303039323431333837656564353861
-37346562346363663164663364653134323764613837393131373631323135373633626261626137
-36373162336330393831333463646465333037373961663766346634366239646163363361613561
-65633835313063623933323433333138396236663138386666613734646137366266343230326336
-63313730333662633133306665623236376163323666356332663237653562333131333233653831
-37393332343930373535306436613531653931396336353462353361643832393836316337376162
-35303931363335663135623064393733353161363732366438383237373739636237616665383464
-31313930343930376633623633363539306663313261393230393164363136306464333639316165
-39313262303738393834646438363132616233373065656437646566393635383865303766376336
-35316564643366306435346537666562393732396465633965643238646434346434306236383430
-34306364373838343332366636653762303664626632396237333334333362393063356535613037
-62666463356665383234383362653831656533373464303662656431383537663139623338636538
-33306336613539633864333864633939656665393039343738316431346432363234313535386639
-61353135666237613534316339313564303132333932386636356234633464323461663434343063
-32623532313135346666306430326635356539323062623139343037306231343632326136623137
-30363135616261663966346166623436356262343635653332376462323538653730326263373032
-33643461386135366636313961333634646339363265303966623762646535653164326539646631
-38393462326362353934353466346161303461383939623934626339333238336164316637646636
-64666431373735623366303232356336633738313638303532373062613163323033323761346638
-64383561383464613664313430393164303132373738646238343361373733326531363666306339
-30343365623161633730636361616231636262313639386433633438366362343238653036386565
-64663062613465353362663030346439313032646136383939613464666236323361323030363639
-32323134326366356463363137656163356634393934383439346434633735646630613661393762
-37663832626334623665353035626231383366313030623061326533616334623230613339313034
-64343839336232613562666233393265623331393161333935643666313837383036623633353263
-31323338303864653630326534666132386261663331393638316662656363333762396666376566
-61326566396266613862343039643538663865623335633363313265313865336164363062346130
-38366166323965326138376666373061396235656235333366623265356535336632383837346131
-38393838323233393336376433353564323536363961393132346631363833613834353338666365
-32313138376332633231623939393431656538666230396437393734353937636563386439666565
-34326261386138313962333066326136306638653937656462656539613166666336396463653132
-63363535333735306331613339643162316531643163373633393962653137366430613630316638
-36613135343362396564613239653330666135313133646536653039333130306533303165646130
-30383034666661663239633535333565393463316630613337623663343538656665393266356332
-62393665656437323566353934346436333733396262623535353435306136366661636463346564
-34323935373363626233393965383732633237656535393266333564643539336564363638333163
-32313234303138303531373463646637343862366564626661383732376361643931323933656139
-63653534343636303431323838336263393234393964303861373237613731656135336263353239
-66393565643164373132656239373264666133373765623434656434386539353837323637336637
-39306235656135353337366130363661386138633930376230376666326163393630373437373038
-36363833356362633434356132303639376437316235346439313764306331643036383632323838
-38346431663937373431383833363838336530633235326333323131323566356233626665616265
-34336337343266313265386630646638326232326636373836346161363533636333653435343630
-66346238373737306430303361346634303465306563306166333061646134363961636239373932
-62663962333635343338316465643834613265393963313633386639353563376336616239373165
-33663665336236303139386439663563636132636165626261363534646138613634383332633565
-38626363336234323034623737366665663631616131656464373465393966613131366465663030
-32623865363838656238623162343261333132366437613364366539343665643133666563633633
-34316234326633613337323231633234316238366239386633336161393937613466323763356335
-61666536316331356337333631643638393335363232346236623564393038656439353863363635
-30613461363062666330633137623531373532623235393832393332653061353035616339373435
-62636466646534663562663665623262373666366665383430656134666666643963633530366634
-31396465343737363439313132343363373834616263616436616631383562353862353033373338
-38636365633830646637313264386431633361653864393036383932636134396163373239363838
-39333137386663663261363562376439343437613833656437346566616466353334396162653834
-30396465313233613362623637353639653238316438653034386639366261623363356134653836
-39336262663138326662633332653864353462306561663262366636633637643938353962616536
-62376435656266303836636632343734393035626366396335353330656639636533653937663530
-38353133383836653639666166343436323831313439306161326133313763323234373164333231
-33376264666266383438623566666336653565636137336636303739396661306566323436356165
-38623134333466386531336566333163323632653837316362323163343964616131326636393831
-64636666326435616532306563333664663366663734333366363839636564633936616265333431
-61356664646464313533316534626561356435623564366436653362666165306564636539353366
-39363137343766333666653366636335386534373538663337383538333432383862656362373539
-65343435366439313239366665663533353562333138383335333761643663333664643865623435
-39663330306238326434653462363233653666376461386463376530376331646266656230636136
-64323862366663663836363034383561313765316665643361326263303765613337383334353230
-62323631636131343639356439386365383937643866656637336439313035613039666139316438
-36623238303731646132633138326130616261653132353432356530333137373033633938346464
-38613137393430396330653430653132646537366364646630643638653939383631346339653365
-32653337373939333664643734376231623636363033313832616465303763326139303436393463
-65383033323966383566623232613465323034343733633731323939313166366639333863353963
-32666439613536643866366235353130333637303464663065393761393035346233643238363035
-30636135633465636630356633663763373633356539333038623332633436333131636637346335
-64373031613634663361623763663235336365613437306361373435396362306562333836303935
-35616236363431656238646635373339303962663665633762643765306362626461623961316333
-39306563363535313931656139366561353639653364386265626432663366353030643735633933
-36313962653731383734303139333039376535326132383066636635613137626430633430666139
-62343635633438326331376238663134376639613835376335383439383236656466613663633138
-37363966363639323463623834663236643734636264396435623963616464383866306539643233
-35646562636339623231313830323637323263356532643964613930363566353465373634343466
-39306535313566303838343239303363386533383431666664386265373633356462306466643730
-33323135636131653863633131656332313763356638313464373433376461653835616565626666
-39336636653732633061343938353636353730616264613931363434313538366461303131623838
-64346339653664373134656261313264646164353534666562386639643131653538646634373831
-35363633653430663434323434333230363734663566303534613733383434643933643139346535
-32663964353062343161343537383030633564633862616439396634363361646462663832323135
-63616461343666393737653230666138653830323965383237643266653539363034656437353630
-36353134653861373063376131303634393034653939663165613830343532626334313133623836
-31323364646563626339653966363865346361306634353661646135643531373964653231666665
-66666139653633353566366438363431383037313161333861336362636337633035613935336334
-39356530346135353239323630383736386261393265386161643833663766653232346633636262
-36303934653862363731316538626632383835643134663331623230623364333035376339613830
-30373431663066333136326363653739656139396133373936393130643461646234393764666362
-33353430383964336637363364383937633139336532633832623830623666656633653534306533
-30306630363532376639
--- a/host_vars/jackson.yml
+++ b/host_vars/jackson.yml
@@ -1,208 +1,113 @@
 $ANSIBLE_VAULT;1.1;AES256
-30616234373462636462313766316334346565383062623830346463633964366136303838333630
-6166663036386631346364636561666635623162353961650a376163613162303965313166616633
-66663964656631326432363335393739303931323337373739666235346430386438393863613266
-6334313437333638350a623330333032636464356535313732313735316338653438323934326339
-61383832643739343632366261326238326361356435613330346530616532343838663539653736
-34323238646665393031336132616530356363663565613039623637316165613563656333633031
-64343362376262346333643065303963386563643031383838323266653735393966336166623933
-36333562643365633862653333623336656439613061666631363565386431633131363664373730
-33633735663264643863633832346134393339303361303136333436633637633533343738366236
-62643835396539316365343039636237313135363532393338616136383338363038636630303437
-61366431353931656332386265306132633832633439316131353763616433366365623862393662
-38386132306337646333363235363034653031323333356466303838333563346464383466666239
-33626133323565353265336463636361323132363365316435656638653337313266376139343837
-37313162313430383365623136306234633261646563343438663035626534666433326261666132
-34396137613734616437323262623461623030666361623431396466376166386137373435333130
-37383232303864646436306262336362326136656464653439306638663566343866646262353337
-66333135613537623962383564623639643563633630323932326265643661373435343636363233
-61313633366465623965653838326530626564613264366132653362623930306136303838643039
-30303135616561363136666634633437643962306562393662306635623438383337313639313531
-65623261643034336163623265333535373133316331356366353533366664373831316465666436
-62353739386334313966613863323666633737656237383733666335346237613063633036656536
-35656166386432343638303062363566363134303939656537376139343161663438616364663039
-38323834326230323930653966326137666637646132336664666537613931663564393935616331
-34613131336130396131666630363834396539393030393130323130666363643532323237643930
-38366339363532333836333933663837343633656363663462373332613933653036373833656461
-34646535383735303266316463636131656637653034656462393130613731383234643934653231
-38303039393637363064663766366632383238646438376136303435666331613161343366666133
-31353833643830346264323730336338616464633162353037666630313536333735633734316461
-35623334623835653331613831663331386362373834643434353866346463643965343561343164
-62343464666663643563316362633633646434646632613964316430396334353333633337303063
-62326332643830656561363562616539333136393438336666326464646432303739623231353732
-32623837643834623532663936636334396333656165316365353333666334656332303131626664
-37393835616139366638373636666535383961383365373936623134623962303633373462303530
-61343930363065663431316661343932393939343138333435626163633764373230373335636639
-64613132313931643164393033636265653362366131646564343164316132326530343839653039
-31336163356138613166653434623963366461636236643537633638316563323230326230353339
-31653535303032346532356439326538653930376332626530356238633633616638666664343361
-65643531333961636330333766613338323137633132643638633235316331393735356138383064
-37613463306331363863646436303133383431333563336562333662353861323032383039343536
-66303766623638373133613664313665653462336237376464643931363135373935356365343265
-64636635333734393864366334643939623664353861396638636336303266386439323436383364
-35626165333832316331316535336564373564646461623330303931663831653262386134333233
-36393730353037626636353064623265663136346264373334383632643935373638306332353363
-65376335666361323461306266623334633465663633633663343865643966326335343865306531
-37383337663761666261613533343530366464383737336564666462653233626632636432333962
-31303536656430613765316134666435653761356632303639336231363631623934636633313036
-66373964633761376230313039313337396132343137666132306535376630303031643236656536
-39353463613564336332656265313865386330333134646161616264623964653365643931653362
-32646662343462313938383266623835346230643334376466396430633961383437633432366332
-32646363336163383531323932383263306563663739393330383036363965316339323466636165
-33333563373633383762396338653437623064346432313762383538663632653332303763393830
-63366162313164626533616161396361363837333435626366643437643763343635393462396664
-65376539383666336365373834303136623039666436366237303966356166666637323663656133
-34646330336431353564633666333238366533386433656632333364303965643635313138633763
-64616539393235343064383138633830313431376139363636366536363962636361646435313132
-64323565393863313961303539633036623561313933376438386137633930333339663864333439
-33343031656239626265613436623934343633386162316366613366646135613636643035666238
-34363863343965333431623335663562366234613137303562666161316339386236636664623932
-62363335376661616564323639653134336535373833633030346265313239653332373331373861
-33303439613933313834326438356233633033663062383131613332663364353539646438323932
-31653834333866356433316263376437343736333536336265373535616138616432333033316362
-38653938393139373565653334383666336366613138363465393135363239666365626635643030
-30633865323530633564653739616530346232646131356662383636613065393236323639613332
-35303133323035396466383132653561383961323565356436373664653231623331316634663562
-31386134336638663432646535613661366563343964666262313161336334653530633534663238
-32343633303937396437363263653666363233653433643563656538663662643735633966613033
-65373933353461356561663737386461306335653639316638353431386637336135343164336438
-64643363633437303335653863376361373038643236643163313335306331333633366565303061
-64333163356437333565326262633636626261613862613230363737346138343861616163326463
-34656561626163663831366566333961666233376237326637303763396435353964346637653239
-62396264373864623333303063333639383835636633613932616364306232653336623030326335
-61663331333462316337333666646632653838613333363765613265346331643133396266316631
-39333834653739303838636633636262396433333530313866363431373935393237613233313162
-36396336333234333266666232346535616165346537333839326532663061663964383364366337
-32376563306530353931333265336166666536353637336134376338613062633563353233313137
-31363664666662646632313533303239373636326364363031643731613632623465383233623132
-61643033626334653239663239386265613532383762303763393662666266313233623538306165
-39393036363938323861323639353766313635366336646234636231323230613962353330636163
-35623736323930313630613536646138353432636265303162393866326364323264343237663331
-39636466666233393765313630383566383339663230636437646662353436633965363130643038
-62383834383130633266303462646437623737306436303638646630653735623139616433656163
-66663734353632666232633735643931396535663630613839663933353238386239333866313430
-64653836343332346635316165663938636433346163663765326163303730376433353465383637
-38346134383132623032343136313832653431656564303462303235613431303036623164646337
-36343565383563376237346666396635386230366566356364343434326163663032366466656132
-37306235343130643630313061323831633738323161333338363162613665306436353137633932
-30613762343133376264376237313931643764623636633137303135326632663436363633353535
-62613337633938376362356436643036386632646637666338316463373632393939383362313934
-63613465646637373132323933633563626335396366653734653134646633396562346435306362
-61316630303064643830656163616438393062636331333065386564666235393239623766613764
-61373933323032663238633639353664306532383338643237303031333461386662656636666437
-61626638366130353166356332646638373439386435346235373938663163393063393139333139
-64373835363332626139373161333062316236333330313132346366653939386365396662323536
-64353433373765353866316262326131323935373434616662666232396137363837616235303933
-39326532666435623734303031656132353966346566613635633233633831663763383231363665
-30616464323861626265336238643936363762656435626338636233626639643635616130613335
-32366632353766353163393538626333353531336434376135623266626563626338313831393762
-66663663616630646136623163336133363236356530646666396238336430356130326465313264
-30346163656339363233396537633033386663323063643666663834343737663432376437653766
-34313565363335633663316539333264383239396165653637356330333137343036336438393861
-34633933396466623162353737353937396161653032383738343138323166666233383163303230
-61373230346666373035623231393466613534393236616434643964343336363462323433336630
-36306138386639333133653764386231303833643233376633613162373164393061663161366533
-66366137646562353539326131306532363965313536613761366461636338386330346662303264
-65356266343733663439363238353834316564383431323432643237396339346239643366313462
-64343334623761353432663234626366303537336130373562666339333965343466663761666338
-36656264363664383831363565633032306363353938373239376363363531643362376164326166
-66643865656337626163613831653434316438353861343062636237373864623465666433353935
-34623133623031373837353039623832636636646162323561356334663734396431323163646164
-31363863613439336133393837623065346537336239366138323832353338633533383663366434
-63653262393562373564383431663865333265373938653666636130333361663536643737373433
-37373962313133313461646631646534326265633933376634396630653161306164616138333737
-61383161386333323066663062643162623237313763646530376238313263346634643964343438
-30656236393233616532616465633264393266613562303161646339323031626631663039353364
-38356464333235633064613434396632626131376534386363346638396661646164373239303836
-36366336643537386534626539623231343330396162323933326530653233313439303562326461
-32613064353030323465323031346363656664653962323962313437626431336631343434393038
-61633238356266653737666231653032326663393365613331393137643039353261343638303065
-36373131623636373937393432396361613233666538386539336365636339343634303433636436
-31646235333461363433373162656136643234306661383161653565393830383863343434353431
-61346534336339316462653862366331306662313537613062663539666636636632653262616633
-66623434366363303630303534316236633836633938643433396538323938616265636261613237
-38333031666161313963393164613536393536303131613164633761366261363266616430386562
-36613865343831653766363866326534393131326336303830613736353532643035363736376237
-65336430623162646465303430326262646563633135326634333631666530313765373239623564
-31303831343666663935336436393930353465663461323532663566313334663135626561366663
-63326461353639393734656531613036333632646265626139366332356464393861366632393532
-38643131313164386262333062343539626637646233303932663535323735386463623430656336
-38376433376362303164633331333537316136373631363765653134333334343461356639643533
-62306233373230663139393537393064366265646162356662623163633232333531363130353631
-65343666313839366363316135313363376533616437643838333431343634353639333636613831
-62326432313738376364643837306336613066396164663864633063323662393763366139303363
-34306538613139366232323962333166626161346364346466633861323362666433303832313337
-63323864616164313030343730356161316136363465326565356463356438386438376636623235
-62336664663336623032306434343931346566623739373638623363613835326133386337323235
-39643566666335306538393330356336373531326565333639306638336631623738383666306337
-64656333653430353635633061373234393366623264336633373331663564353665343762363934
-36643866663862373133303639656330376666616133666561386634303039393438313330326565
-66626561656133653239626365313639383236373430393632353539373164383438643236343630
-37643961353433616366313465366461356661383163396335396430383134323232343835343665
-30313935653931356234663466616130313430376138346139346239636433343834636239303465
-38333830343831376236393832383835363932666130343163373433383862623530623634323934
-64306131656262633463343138326437646166666461336338353737616565623961373366643830
-32323033643065633462306532633861633537353036353436643733353837343737656131623764
-66323732303038653931376433356334653865343863396464373230346163666433623065346531
-35623938383935333738666432303430633534616536643465636532666233353336336336666464
-63626334343161613030333861333133326464386430623333373661373538623330393337636439
-64323932643238656436373131393465663561636534326437336535643534306134666564373734
-38303432313362646464343861623738353136653262666537623737353361623536623035343063
-35623930393465613161626136346335363538643363303336663030306637303661663138326130
-62663363386538376633666365653039303832643937623139646131346462323764353936383661
-38666335616338306630396139316439333366306366663836623461393666323939666162326233
-66613663616635396135393064356634663936633865343466343530643339613138616663636462
-34393665616261393538386133663538663836613036623533366463326539393461313966353562
-34633266323738343166346337663534376266303563376137656461373734656137306139643163
-38666465353431363834363530613134383363356161633562313962313934666434336263646365
-31346161386235396666323362666239343930636662323735396537393265666434373562316366
-61363566353232646162303637323736656336643463663934636434383161623764346237356532
-38336437393038356439613763313263336161666265666134656139333934626561356332396634
-32366536346631663532346437636634386434336332613862393561383664333863636562643737
-38386232396265346363353735646438386266653533323239313364396236363735646133646664
-66383336616563656132666235353632666365326139326533623230633239363361623530636435
-30333931656162316535643731306236333762346464396634323338653063396263643966376630
-34373237653133643131633462373965666333636163646461653535626566316366656565613138
-38323563303165373434356361366231376135646135343233393130376261636333386264613334
-35356333383736623563323131333639396466653635636132346362396337323931316334306338
-39643263313661366633656133633635653139363661376434616331376364366166383563336566
-33636464626461643731633965636636383365393932353239373632633461306639353533323161
-64313165653463306263306133616561373436326432396665656465636632626465346639313739
-34633938623534373334663265333164393762383935353733623133373163343665316265326364
-64356138626337636163323465666233383761343561633562333137663363333937643637393661
-35663666343638653835643136313164663463306536323231656166613937633233396461373339
-64366161366562336638653030303764356434356438366266616135376661363761336532306530
-65656534373836636437356466363165393663656437313431353839643034323563656666666332
-63326633343338383137346165626135366232633764373963393439633235663836353436316233
-66633432623731656261333239306161396661343562346630633930646136366465346665383365
-66646665386639626562666434663962636366316161366661396666383562663032376638626664
-37336339313962613631343664316632393431636464383535656231353033366430623231356231
-65353332613532393439373764383131623230393165623830343730393262613731386330616465
-38343431623765393262313266653230323632663534653265376265386431633362356134636339
-38326335363032303665333164663330323664623865373261343437376435633861623531393265
-66376336623338343462643739306536633065316433626463373366343463366333346637306466
-34313333386462353165626261353166613065616437393238393261643936316130393138653036
-34343165373138313433636539363261303233616636363461633737333338396239393666633838
-30396364613633653662343534303234366338376137383539373261383039643735656136656366
-33383930666534393236353339373534663237353065623034346366613038653266636363623330
-65356631386535653365323361646138346439333731613037616332613836343662346138306239
-62353135316531333835393464616266366161653964333637336237303334383565666131633631
-38633133646336656563643739636464386139613833653266393663636431333164336631373162
-64353161626233303164396537666133353230653961306133633133623066313530646361323265
-31306163316637666330343739663739643133333461326563646333623238333233313433393731
-38653332316632366133383862633938663939613731323332343035303831313138383533323137
-64393262633532646461666336316564613238373662316139306165653861616236346363613062
-37383133376266616339633262643336656161383236336461663533353034646665663861346632
-36373162373363613764306637396432356633343533383833383164333230636664613235663039
-61613732633665393038313937653231613730323766356462303537623866366535326230623835
-38623866643831616338383466343739646463653535666562613437643737323037316161353737
-64376239356639646438343466313737333565306637346331616336666339376534363338623761
-39643837386533343264333338346233343836643231343631303033376537356631356632656134
-32646434343637393161386233613463623633356430666237643062623363646465373438396465
-37646336313931663639633736373561363563663039313164666333306436303736646663353666
-39353037303133376431653038383236643137666363376365613532306636333339363635613562
-35373865313733316561323366623761363063613961626231326463643965343736396265633633
-36333565663630636131393330313336396261373537616434623136633738313530363635653232
-65636231626665623034616162646265376232663336383164336435333336343234613131313538
-65616331356564666134663335356234306465313439366162393036613232383262653339303062
-653135663936636133343035323432363038
+38663262326664303464653331306266333862363635643761346638366633666563303035346662
+6230313164666332623438636464313435323532393636650a333039326661383864373838333634
+34653135643737393966353932343066653166653339313939666161363735636634643466363036
+3630633764646438650a393562343335316363616564383733363233343463356633353837353138
+65376435343730626466393062656233326330303565376639386332306265306266356634383830
+32613432386561346634633334666365323061313833396364313465326664353064653237623136
+31343762383838316161306565323432643630343537346166616666353738343034346233313266
+62353933323432343564303633636532396439643937306366313333626430313639653162333364
+36646463353964323139613339326462666334376132633834313537653761333832333436663738
+35393939326530353064633333323139356234643031653130633665303434313365663238643434
+31663630313036343939646631326239343361653238646636363234353062346534363039373637
+31313562666133343732626438353062663863336638323037373361616665613831616165393835
+32336334393739666366623933626265643964663831336337343632643732383264623534383964
+34313030336339613934303637363964653064653231666139353836653734626338333331383961
+39646331623636613332393663663135363139653663383764333433316430313136356433326235
+35303962646463323534623263623730313166643232303566343135323537386635396165383539
+64393165623466633936393232363730313233656139383935343561343236343763623232343736
+39383765633662653434383965646461663730373864326561343265663838643339616539396364
+38313566343836363530613336326262373736643566323866386565346363363333636262613331
+38613065333465363931623462653732626633316638626632353338373636383835653165336666
+62646133383639663934656332613666663031623530336362633234633534363738363664623236
+62316332363432346534353336343561303066633965373130626664343935393833663363393062
+30333739626636323839623663393666393239663562653333383066303130363638366566666532
+65346361636537393335393330313635336665636638366530346335313761323035623666623734
+30396531383064376661363363323161353132356164636132343531336337613837613931656136
+64303034626261643635356165636463326565653035316335353730396431663261363333656265
+38626664636637623866343138303131643462366639336237363566386235656438343138666237
+61653164376663326663646631393666386630666531666465373433393734653737343765363964
+64313337336539336664303262343333623161646135633039376637653932626432333533356532
+35306561323464623762336432366530343661363037383939383035653237353466336531653434
+36383530633661616564333230363633383665376139353836643334646262323938643139663138
+33653766666233393332333134386631316535643163323362356539633932323738353636393164
+66646466613864633631656565303038613639633534306438303731356232663332316633623361
+39303262353565383636616131333032306531646566313066373231313730386331633435336133
+30626564643965303131666234663630653237373566653633343662623864393138353265646333
+34336338356163323139616234323137366365656662633931666534303439326636333562366530
+35363266633334616463623635666632386338653432653832326636336337626437643061623638
+61646561666162616330623333346230613965316461383034333734383763383635396433373335
+37653362636132313139316336356264373763333361333630366535336339623166306663623433
+63333338613261633163613865303962383238383963353530633136623362313561316533343737
+66336231323763353964376339613531613939336238656364353536346436663464636637303337
+39313066613164656431383162326562353036613165613635346639656233626439623939393663
+66306136656236663766643738303738616230626534333132666331316439363136326264386635
+64616337613639306536373366366235633766613033313464353538376363663239333930363139
+37666231626334373132363863346232623866353032626138353838333764633738386166666265
+38393461633832306465633130343634323763346464643262653330356337353534636566353935
+36333936343130653861303432626135383438653134326162613833336261613839376161616136
+31666436353361303438303735623139613063333162303566623431373031646434643766363335
+32363835376438613163666330333732353432396661666632663633393965396531653830333737
+63356238613537643033643765616561666163386364376236353031656465333661333830626230
+32346431633464636663366364643239386135396235336663626335383663373761383165646262
+37313330376336373462623266343632393637663066313531646333666531653132633164353266
+37636238623637363166323731653739373764343965626530333834366233323435646339636233
+39626164653331643036386130663539663532643232333338656661333130376537333261346135
+34373565643535616333326333383231346162383032636132333166376163373761306337643235
+61636363323761366236326139373763306561383331303563333461386130353039333862336363
+65323532623538346638333036316430303130316366376632623133643933393466353162643335
+37383836323631393664636262333839323336353835663138653061623037636262333432613131
+62303162646133376263306361663161636131323030396164313435356164386239393032633061
+33346438373036306365363935626539653930386638383265373733386366663036393637656264
+61303235326462626630366335373561313730613163623339333630313561663636353366393564
+33303861623038623135346164376636323661373431653962363332653766663438323664376561
+65313835386464616361306438316434656331653632346330333131626536323064386664633430
+63353062336630663935353838316366316138323037383566613166336138306262313766383630
+66336163666262636435326231326437336333666265663434316635313430623437306230646534
+33643039376230643163303562376261316163626436626363316234396263633864376331353230
+66656531646366633163336636343665393838666166643966306636363462666361303839656433
+37353061656162653336363333343631633865636566646534306231353064643336383365376335
+66396339376666623561393731633462643330363331623934643935303563393463346563373964
+63623063376365646663386431653533373739343962656236356461383930373366383163666432
+65353664363565646235393134316562643230383962636136633866376534326165343864383736
+62306333386636306330373562336137386338303836303365353834303239336464613966313638
+38333437313635653866396435656239313535376461623663343663333466393136313936353831
+66646465663632323866376330316266343033646466316564613261656666313634663735616535
+37393664613033346234633163373965393763356661636437626263326666643934653931393931
+66373338636463393536633231663564386561313231323463343638383630396362336239333437
+39343635663830313234316538636131653765616636613631353432646163376338346565383038
+39306631646563636130643530353865393337373066336666353732633161383933626635623735
+63623736613538396635306633393030613434373433663563643065613935376230363935343563
+31316639333664303361626661353034396138623864373164383362356666633763323333363936
+32366635633162376436393738663535313338363665383566656634323932303834656639363566
+33663637643866333535646662643339383339353934383738343138323466313130666563633433
+61383033616338646665323166623461366635636666326365326666393739303963353365636662
+64653132376239636630396430346462626136323734353631356238303838663563643433643833
+34656635373431623639653062386562623539303938336334303238666565363137613638626339
+61666439303339323061326337623435383662613761336165336361343762373935626131383135
+39633562353339363936646263313763326366623833333530373032393537373539386636616532
+34663963646234356136653261386138356638393335626365333263396232613361306239323439
+61663937646561336637313831373730316635383564346536663533656130323863393566386261
+37343563333035333233666362653765333037353636646265366235316163646430616635336534
+63663330303535663237373466666162356236613137623663343262626431316363356439643734
+33646537383963316336353132366639306136353566313038363366666261313730303837643434
+35663638616333346365313939303636656361363634373837383965373932663565666434383636
+65333138666466356334353837303838303831353063333336393335343033373539383662363832
+31303834366531393436303834316139663533333836376136326364383333393164656164353630
+64646535363231303137303732643863616237666562363763363265326131356361333961356133
+63396638636330393938613839383061616166373865316536323835363565613937363161323631
+39343865393861373136383763646438616537373866663466303165616461373365656130613661
+38663734376639623966633239376134386239383638653730643439656333326532303535373735
+63663233663963333661643734316337323263666531373665343561396631396563306161373964
+62653236366136353463363735376434343061643732636533636634653363386336303034393266
+34616263376537383230653263323962366164643939646366653635663735373939633532323138
+64393637326131666262316639353337666632646662663935393037303335353762326163353931
+34663535363232383232356635633963626637333132366337356537313964616434323261653936
+35316462373631626438343538363533393964333463666566323135643165633863633331653765
+36373861386232303739636438653735396538623336366236353238643065353732643136333561
+37663336636138306335356630313231373732333936656231626537376564313064653433313337
+62343763343036636432613534346461386532626139346164633738346361653634353636623831
+31626566336234656661303466623364626261356331623235306265333937316539333539373133
+38373532353734653337313834323037656431666362333333666237386334373063653530623831
+66343065303761303035346664653761376335363334373166393861373236666565373131303539
+32373431613532643236
--- a/host_vars/jade.yml
+++ b/host_vars/jade.yml
@@ -1,229 +1,221 @@
 $ANSIBLE_VAULT;1.1;AES256
-39663135633963326434303864363561636431643561306162306164653033373166336663376435
-6338316264626661303737306537336666613838343037300a316466356335333735373566393965
-63366361373239316363663235653635646133353761343733653336653961303661306338663462
-3861373436653334660a346339326433313831316365656331363165303236356136666138376164
-64366361633863343232363062366265323663626439396236613766366665626635636132363863
-36303937626130373463613837313035663165613539323766613863396539613237633837373539
-39383435653839613665353665386236313462356338306162376331336335386233343264346463
-38383661626538386337306331376630393530386533313364623539663134643337303062343331
-36353166363731363631366536613764623234313039393237316263346139663536316534613536
-32353836376538633465353537663266346335663931663936393731646131666234313361333163
-31363664323036613730633233303632623930653533393532333030366633383135313132303161
-66333464303663666230363332363834643133623431333235656466313461353331366437346666
-62633038353763316465623039663238353664633738356531363039333532373337633664316339
-33313961383962336563333764653936636634623739313834363332363831346666643033613436
-35363962393032303063633032313534316462393562306132626562343463653432353966626338
-65343633626339633932633931306339623662636565653534376263343562353363303663353938
-32323561663132383531313533343163653732373938306663313832333261316462313233306537
-32383131386636333532373865313236613730343161653265333636303032303139383538336431
-36663465313138306139393735303935393836623535373337616537646333336465656265626636
-38343463323038303738383132623362323861663665316136336366633134323634623665653033
-34653330353061663737386232303637306239396538386361333632383733663635623438383666
-34363463353964336664386165663134636538343839656234326565313834303031623335636461
-39373465363932623632616536623934326364346239366332376435366536396464306666383963
-64643530353134633666353666646534303366653635336637376635353238663264626465636661
-38653261383835363130653965643533303131613230303633333663303761393335366137323538
-33346631663736653266666432636661653565613037336531626236336465336334626363666138
-66343364373737323361326338623061313165623232313036333062636132643261363830353833
-65303835646162376431356436366439613564353362363962353062653061623366666636303661
-35333430656166373839626535343536343061393232306366613730303135353732326531666563
-63323038373066353935646538376536636465616231356234663866393862356433373033313734
-61326564636565666337656533326537383061303038613132353634306338623133363934316237
-38343364663238636338333234383739393539653737373533653233613037393564336162653131
-64636233386536303939373033373631663764626564646639356136306337643164386439393231
-64613737343932313635366639613064306632353634303464653938326337643137363139653665
-32386266356463353431333535333230336235663433633435303164313736366539383265663139
-34383261303330663131396466303734393332363230666262616535363038333331356165656135
-38323733623733623735333035356661316164346632323336393464663266363164613463376234
-65333966643839343030323232323231383933343931323062653661353964333435633037303161
-37356531623064356635623764336339363635303563653233353466356234396664396136366464
-63626632303835396164643037653936303739383730373639346261643735303734666237633136
-61376665353234333263323032326233653233323438303037306665363932383932646133616263
-64623635396532333062363230363530613338373631323563363336366231316638616139376562
-66316134386365623438616261353135613066303064353233366664343065316536653165393633
-63346538343530346434396362343363393530343034353730383665656666386661613535643764
-38336365363764356266393261363235396439376264613932313663323638626566323261316232
-64613462303263623765353232303831663737336666663866306234323638313734353039376365
-35343133613334306162323961313232356133313338383535316135323930333339663164336430
-62626533343734323634306437663437396534356465336532386463363764613639303063616234
-33643631323833616532343335633633656332336435356161326339326663316532343161323365
-32303736346437366437346237396136353134323162633933623034613735646131373664616135
-65656261366432333734353530356663626333616631376433623566353634303862643733323534
-33303434613061653561363066643161613266326163623864396366643734366663636433623564
-34303833653164646434356463613132336533323561633133623562613266653861643762646565
-64646164313531633437636432343134633330366135663334653539313738343638373433666438
-66653531356566316435363865633133623035663764396463303632363136643338333664656462
-34343665303164323439363936386139303366373234613462313631666364386162333566356337
-31666633616265303562396362666532616663343036663138386164386462353363396430336434
-62376230386566666636363564393333376564623532393435623166333565636637356266356464
-32366663616539626461623534376461303735313565333539643739353866633135313835343434
-34383834316630626263306132656562613361306464373733333731346131306163336631373266
-37376537623434613864643666336261633632616562393537623861313536613636633064356334
-31363935643361643039643564313762626136363563316465626263376162333861333231626164
-33353536383137353565613035643136346234346632316539373131303633383039633666613832
-66613437316664353132386334663339346533396630303530376239383933333239323136313539
-37653432353863373931663734333364363662623132366366383737333034383638376261323734
-34376364646366383163396636316435653739666631623063306261386630313765623934663965
-66613365623539313338333635343432396563313936303635636564383961303237613263316566
-65366631393030373663376334313630396162623663653964323135326634616564306337333762
-61663836643934396662343566343638656233343861636366363262303562666563643665663936
-63343031353063386261396533613037323130373061313261663865386465366136393364336261
-37353961323762303763383738643166643366383363376633373566326635343638646432323037
-35346636376562313963396361306465363436376337653032336238353766643861636133303231
-62663731656161343866613465386432636437316336306630616261656436323437346663326536
-30393739643331303938323666323264393938376235326536343830396238393539633536376339
-33623739333831653439343831386638316665326137646262613261666333616532343735363465
-37386335326166346563393865336662633735623166326436386638333030643564643936313036
-64643864336534333034376232653138663264383530313338663561383938316230303036323765
-64303435396235343838323766626138303365383264396534616130386431373061373532363334
-36613037333966386165663466396663356535323336366531383632633032353037353337616637
-33333432333061643738623037653564366263316435653233303266663133616662636236656134
-32636339613533653338623163636563373435616134636663646437323062636565316335663462
-31333365666631336136376133653933663634613662363265333137653066386439613937373838
-33373935323135653364396536636438313762303764346138373136383934623838636265323066
-65396565383131633039333230393464663339343566353634633737636464373330633936356266
-61313964636137666365623261386630653030656263373033333666643135373633626534653432
-39623761303039393764373261663432333434343862623364323331333839643033653065613634
-33653934383233616335396436383065303239356331646165323334616230613137313435393562
-32616331356632303662346531353232323732666431623464623061356336643832666634663433
-62373463656437393439333765626331383833303866396639303661626664313766346361353864
-31636534393938326539323739356362353031356664343136616432363065363265336536636530
-65316165643231623339633666386263386665326237323438333537663266666237363966633063
-62373236346631646431373139336534643237646131373335393166626665373039633566646662
-35623665643835346630366336366231383866333134383939643639393962646231383432656630
-37316332653931303234353538393933336461356636353537373432306364373565633666633263
-33616461613731393665333265353436663034316134643062343362613934396631333532636339
-63313334643238333338663834356565613161323030663136636161623333653365646130666137
-33376265636464646337653763636138356666393733363735646131383261306230646135303666
-32656461646631393630323534363961346337623563393537336336363538356433363833356131
-62366561366463326131393964313033333165333436633334393066303532386630646233343734
-62303131323630333664646633646334383333346662613337363161356636643066393938393366
-31646131633232373661626436363665636566633638313539356663353063323039386438386330
-33653738663233343763336264623335393531306331613338316564313137353730323261333166
-64396162363238303831346433373736383662376362653130353862316230663139313966353039
-34666364336561663936613134646665393362626366663039333963336234653962613062376337
-32343736653031653164303564643932356635663836366136343530333166653232623264376633
-32343366313062313963333133303966303333626261373638356131326239316531393463373735
-32656633363064633832313537366538636235653830333165393539336133363065393165633734
-36626435356462326666666631393564356539356263386236633435386635396661343966623763
-62626164346131616661323533353361666633353138626661356362316261663662333034643761
-62306566373930353238616337333435663838666263666566313463613132663333303835663335
-37363531656136303530323630633437666232633931666564363966616662316231373636613464
-35366463623964343239303736393133653962353564366637303264633531643635626334323561
-37393966666564633865323135613766383533323161613632316132643466376535373233343030
-66616463663064343766383438313938323763656266383337653166396137383538396635613565
-63383239643439376137626535356635633832633662643832346438313330666566393263666266
-32353534626239626430636133613633633833336563326136366463323666303132303630366661
-39663766346638396330623830623237363734646331376537336265393839613737323437306261
-65306631353563373961663530393161636539623264313364353731326162383663393466353136
-33373337343065646331656639646236656333643033393634383033313636393466376337346435
-32336431303834643639343263326637626133363034323138336633306231613936366432643762
-61353562306439336131616633643638306361313236326339376135623966326331636164363438
-31643132636139616135353339343730656136663962336362373062313266316330386366333134
-65316166366331646530323338336238653137346536316132333039373830333631323539353464
-38383563346161633739623030303832353133623432303736666566636537616661613034633233
-61626230383962323533343661363935343630303731353730666231396263323936306234626630
-39323764316262623335353264646533653739306464636138663831313934376465663630356136
-35373564333038393831656663396636363237316632303633363438393162333035633066663866
-34383531396138643464353938393366636561363334666430393138623337356664343639643862
-31343030346139366439643235346639396536393833316332633337626530343831626637363365
-63636334336230643933323034636466623262636532623761383766393965623461633832613064
-65353933653131363634363936613735353637643435383632323864663039653961623238663865
-66336561373865643235646561656139363361386537656561653564633061393334383939623935
-61383836643234383261616662623566626662613934323465656464653966616533316637383733
-61613137336163326261326563313632383165636139643231313230306330396636633233343732
-39653930393533353664666236393130613530623338323362623834656562313534363963386530
-65663864626432396533313637323661323166636137333330616466393233323862343766326533
-34386234383835356234366230396365613135636634316162653439613131613763656134386638
-39356134613037353533306564633938323331663263303831336232303535663532393535643633
-36363164316130353630663535366339376438663166333663313134623431613865383136366563
-30323739666165663731303363353836376135313562333266623262303033623562626133626135
-39393630343731646630626636346432313035636239396536373233653934383031663434353466
-31656261653735343832383036373261323963393036623234306633326363366565623366323065
-33623062613634316439373765353034353464303230643662626139356364623765356366343462
-31336362343361613865623233303034613765376234373733363461333335656537336430653733
-30346530356436656561313639633238396364646537333762396331643836343062643232343231
-33383234333966643537323164313463373137363334323433393330373139616330373034613437
-37616534626136656134653231373438366239316664666263663764623562633966393734393932
-39363033656638653331333435623734383365336264633536616132343133333939313332353063
-32613337653935613861386234663935636130353066383432316131343262386539633731666539
-31383337373365336531356265393339353233326266333264343535343932343331316664333035
-30333633386663383333646362316435323137616239316334333836393131336130663966353133
-33666230393138623239666266643361393464333938363162353934363962666633656437336666
-32643264626464393737303864303938316638636131323936373333353130623631626266616230
-36386537326464373062366339303564386133653033396439396238633331383335613336643766
-34623133373835363835663134356135643931626563663339613561353465666563393138356635
-39376365393639376365353362386635623063623461386539663138343132383963636466353564
-30326432303665393636613239313838653265386563393062336436626138313265643636363137
-30323166633364376365643964386135303530613435363936333962323935336361376236666632
-35656631633264663935626263393930633430373261643661643333613164343434383038653534
-66333431373135636339663364333133656534333631666538616632643630613865383330666233
-39316564663065363563613663363436333236396436366134316631376635633638393666323764
-38353862623931303731386239363264316132343737396564383635663137656330306264393430
-33376564303333323530373630633734326535663334623863616266653661663563343533316430
-37393061613064383232376637383161653063366436613939366539646261343030663161656461
-36616235636262316261363563333036376163616365386266646436326534353630326637393538
-30303237666166373231393737353566376433623236383366306563633039303137623039643534
-63626461653264336663656265623538393034363036396561366437336138323731656534343565
-35316634376334356532346636353961333630336466353439343037343566343131633063303561
-38353735376161316432383734353832343263643937396137376537306434363762323437393332
-30343964346266636330613831313331633036613736373763343663396334353133623066333138
-35666133666639323766663739346434636634356465623733306461343962396361386434396233
-38353436623461363238346166626165353434323731616664326265653732326438636435323930
-38343833613261623164336430366234656631623538393434346666633636663732336563343832
-33636336663930303131346462613630653465363965666631633865303162303933613462363930
-39353632393062353565616663323533333462376434356432636361333666623166373163383139
-33373034393033623561373338363533356435653639393766333133646230356333636162623466
-63353163666638616631383135376239353364343966386433376132643336636139653063363563
-31326436333165623265336537326265316266613532653664343162656636356433343836313732
-37373466616231613838363738393663663432623535343532316461343034353636363162376563
-30336562353861636333613834663139346639303236393737373432326663376130306134363532
-34353265393736623962653934356133383037623531313565323538336137623063353230623165
-63616231316530356665646236643935326138616564306363663633653166373239316131316236
-36376466613164343832613234646234656131376434333236343166333833346664663335353134
-33313232363938366430303933633434356137323162323066306634383137336362306639303837
-64366539653530346164366638643737336265646632363230306562303233343635363935623736
-31643561356435343337313466666139393334613230383431393131323837616262333230653030
-64373535313266303338306634643335663062663832326661663335656230353261313430616661
-39383031363564666432366632396632623034373631393862326435326432633964316136343630
-36646566356566643231373638626433623539376639303564623034623532316138363262333265
-63343135653533373834336661373239643332633338343232323331373738326337626134323864
-62343762376137343464373232623562343862663466336661663565363839306461393263353365
-30656466353161653865353034643063663839393265383237333466366464636534643833376637
-38633037363834643536613366376235313439643638626364333864313065343335383462376665
-35386661636133613466626363356331346238626339613866316463383263313038626233656161
-34613435333932353739616334653038623362613030623435666235343134303661623434303864
-34393163623430646530393461383166663832346263656263336366386132633038353839303363
-66623563643736383337623536346535376533353231383735313435393930343064363962373064
-62663565616564633637353331333236656562353332353263616137636536323237303266376531
-34616538646134373464363039333131633039633033616465383533623432373239353235346630
-34383466633862313539373738623065363536306661386662663932636163623830353836383666
-63393438313933356431386137316137343130333232316661323432383965333361323838646439
-36326564613262346134343135646335653263356664313432366338383763323232376166346132
-63623563663030323239326161643165316138326630373737333133363765343462356664646432
-61313561653333653837613932626566376666393666396236366163616231623963376532613532
-65653435613465323832626461303663343061646466303937343938313434663937346563663037
-64323863656238383063326164366166623339306661646137333165313662303030353966333834
-62326431363636313932326265633561323336626639636233326161383032313432353664356239
-37373065323230326264633965343538386638306163666634646630383639656538316430656232
-31646638616137316639383866346562393236373966343935303033626131636463303935626664
-34393561333339663235333237656332646165663266623932323439616564656636666238623066
-31376139376138653466646434356365333630396236656133306135363639663730316632393165
-62396137633064616364626537373663363931356436323731363762633039383137616636366436
-61343063366262343166303161326638356637373364663862633936383766333431316435336164
-65323133393337323436623563323838356366656438653733333165313262646163303361626335
-62616137653137633561633837653330623337356639306564653831333331643335623232306330
-32393762633631363539636334323837323237373631633837636536363831363831663534363730
-30316233666262613731613435626239303738386537616132613730633935373932323066356131
-66393238333432643235346638373339346662363837313336633361323839353164373831396533
-33326638643133306461636466623536393536613635663234613166653161613635333339353663
-30356134653036396337656261396162643534313231373665653962643065666466363431333738
-37626338663738666564663464313731313361353337643565383430643761313638666234626236
-64646164353737613661613836336361396264386266363830363733613533303162666366383034
-66373432313236613461333337376539306535316435636534396632366639353061613461666436
-37343663366239303365626337366263343363306636653531643566623863393234393532373032
-39373336356263613432303030643436323730323963613539616663663034386638363335326435
-31633434313963356537623231366161353035356634383262623035363734383438666331303530
-38313664653063383838663832636264626563323965353536393430323136633439323764363333
-61306134353161316533
+62383466373737653035333232303338326366323539316363336337393862373265666333356433
+3261393563633166343066346436363532336261376134350a353937653561346237666134343561
+32623332613731343631666563663731663739323633636239353035366335386366626366343934
+3333313835326639340a333463326635643561393464643063613530396430333838666234353538
+32643366326165383435366266303463626330343533346561646232383337323332623663353131
+66306538353864356466663233353237356132616161373166393736336438353066303963663764
+65643465626461393232396461356132383939353035643736633437316132386461313131623961
+35366464356133373333663530613066613233303161623534653331393864376333303937333037
+61663239633030626339653062663939633662316633376135626466623637656239616234373461
+64353633386638363132643530366237396335333263306136373939343565323765313565643666
+30366162373337366331313232373333393939653561626238373236393430363464633333313562
+63626463313336363961663431366364303065623933303261303963326266386131346566323638
+36316161343738386436383731383961656336363137303566366335653538663432323765663062
+34626232383533643363383039643762626337316636626438633438383037353432323132663464
+38616532316534356632643630326534643962353634383162313338396538643862313061613838
+35636165366337623532623737393738343230626530623330303465383263393763623664343466
+63666135353663363961306366626162373836653461316537373961333364373236373361383238
+66656636646665623739326638623061663765363030316263613666666364663261343830393330
+65366366306333323837343666633935613635396663623962386430613937626366313232363962
+65613064303731613865366432353866326135386464386637363335653135343665623632663066
+66663165633163396264303236613734383464633966663663333731616665333037663538636530
+32323830303864616565363862316132303131636635326431303261313131646234346164653862
+62396666303961633165333931653061613132396433393436623665383033396130336231323337
+39333563313137623035376139396261343432666130306566326662376636663938326439663235
+66636561663464336637323663363363333338393665616339643864633839656463626665666664
+30373463363135326134613730366430326666623766613131326562366265663662323438333563
+62363037356231656664623332626562346266363035393562336262373363333366383739616636
+63333763303038353234643564303132353834353439656239396463313862363464366634646439
+32643638623035366632396234626134393461633163616664303934623861383462623438323831
+33316361363830353062353832336366363161653630323735356239663037616364636665636330
+65313531396530323064353862353939393565376662356138653736386637623265326632306561
+61343764393034633461353432343830326661353663373965373961663330313035396437663738
+66333539626565313635663531323366323636336237306561346234323962613636653864383532
+36326138383566666434393932343439653263393332663766626261653336333432623337343439
+30316336346466383333313332303238383761303033336164613462366532353761383333666665
+36306661303832646432626461616236333730353538663765653539303561343534643862356463
+61646361653464653462346334313232316633376539643836326462336236366330323061373538
+63363638643862343539643639383935326439356534653339393835383139626539373834653238
+62396464373766316132376136343631316132396661336233623637396166376466353936666263
+31613261356366356130306437613364333866333830643665333866646263333034326336373563
+66343764633164666666353161636236376163626262373536353464363032333561363963376266
+37646539316163336637313863373064393466613863653834636639626566383535363663393866
+31633737376532316165333531656166646533386439323130396430323431376662626661383564
+63323265383933626631326133636163363630666538316331623733663535326261323438383263
+66623035343132646466613063396561323164323336636639636535393832383234623062626630
+66383739336565643563653438376430353961383062386539353965323462356462353266306163
+35383964616562653563666262366264343735333461646564646264306365373933656565363136
+64313530356536336665393333323464336238333637306562396635383835306135326165373763
+63336665366461663137383834643136383034646238643463656539386330363761363064613434
+65623836323732633262643062396366633264396334353938633463623462383563343631303239
+37363263383935333665336334366334323166306165333466326232656637646132613339323239
+66303830356330396432613163616166323261643861646264336436313733363362343835646464
+66383762613665306465643938363631343630633733376137383133346465653662313938623237
+63313333383933393131373039323065333635353030396163623130303462343764656533643936
+65333239333236393537373863386435623231376163323261326331306263326662653132623032
+61663532383865636566623761356533656363343863633161343230633433306533633130323131
+37366234376565666633353962353939343634653662336139353662356337393438363261353636
+35643563316165376233383134653363343262633035326261666633383437626237373637663932
+66326636643662636539346138663530623365376330343833363263616666623938623736303030
+62393135626565303464666138613365623632666638653265666139333930333737663965323631
+39613330363561363366333765313837343462316633613835313865656363333132326336626539
+39623364343131306263363863323730323939353261646335366133393962623137653864373131
+62383935313265363937313664336432393965653463643466646137373630373631363736636431
+35323432636633663138376339383131383461656465643766636636306565663639623163636234
+33626237353334396432656530663833633235666239326336316139323439633337663433643331
+35643766323361393064336137666664396465373765393034303462653737663063373065316465
+61336363353831316338663536653063613061333034613237306531663037653835663538666337
+37613834343164396133343736393165663263653161663537313234613366653532646630373766
+37636331326338383039663030346666323234393632363233323037383863313564363563346338
+63656261653464663663643231653833346130386433373562623662633963346630336533316435
+66333439396638343563633138326431346131373439396566633232356535393565656231663737
+36376163393133643337613639303039623832666438666661383436636661393233366663333838
+64653564623562363339656162353836306437303738373439303933313637393464306265323336
+63326436393364373931653563356363313139343734633663316362323738653738343732363138
+61393761326138653036643332383235626236356564633232323462333135326264353937336463
+31313965366132623737353232373134323433306564333862326634663362356238353465653364
+31623933316465666331653831393461316538393537386636376461653236336434626134616662
+62623634366336333739373332376239386336336631396263303535373564303862663666663562
+61313830386438616262633533336334353735333331346436373230613363356166353430386430
+62343735373231656139343035396562386661356538376661643435353237353962333930363939
+61613733653064343833396530343432663238363537373631306132666235613330343866353031
+64396531363337373236656235633261623239663439303834356139623833623339353862663230
+31363039663033323663353766616465393063356263323239353461616239346332396532633066
+64346563613934633937333433383764363731366132626365323661313962636464396539386236
+63316563353661376330346139663737306162366661656461353862326666373030336136366632
+63616439616630366435623065386430646537363333393965663534383531323462373833363965
+64323931383534643730303466373366393435313663306631666364376665626434623430326164
+64366437626634643362396565306665313231326336366630326163356630373663653633376434
+64393033336463326631303862653337656163343932363661303862346133373562663537663930
+34373761373537633130366661653539343931383663653234333663323738356535306664656664
+61383337323238636634373830626138393466336666386262393039393963633835366531643831
+35313531613832663637386566313436363566346432346536313263633038393438666431663737
+62633631656534353961306663613634616336393833616166613836373539333131633066666365
+63656264353831353630343834356239653331376539376331386663386334366463363935656431
+64386439656135383139626136653066613166353738613262623231323132626330366561643030
+36613765336339383863666535303930626534643934383731336461383432376461636230343030
+36383330376231336661653735373961643936303064373365616333663836323663333361376462
+34616538343235366332633430613130633237303363353932346366636631366466306533373063
+66363832623237636266643861363238396534666164393735303165393933623766313262323333
+37623830613733333162303061383166363838303965666664633861376238343165633234633232
+63636633353937376131306435383061343030666361323061616262353935643030333966626433
+35356562316336343932313539623239363036336361326234666339366335343033643435346536
+65346261663338326465316237353934633334353033646433353035653530396232666638636262
+37393532656561643839373333363331316235636566316531393865633131373936316236663839
+63663835633437346336626432326235356432616364316465376239363864323561383636623338
+39646266396162313938613062623430663237633465633261626562626636396637373137366465
+65643134666236386538643062663135643266303861396337353638306532306236636136623039
+34336130666633313661653761393536346661343063653562326462363434366531656430353232
+32643164303364613362616631356364643835346561383962316265336637353837383462653037
+34633031346261633835373131656166386439306361356636663338613731393434323039353665
+35636365303365353833623463626463326632383737373235353464323939616539636531383665
+32333761313439626339613834316464363835636331373331363730373861313739363164313330
+33326136326566336633316437316132613430393166333130623335393232653065376131666465
+31303132353465313761633265313266373132633231353766346633386639336464613134353832
+34613035396165633864616664636563353265316432336636326632386234633263393261323136
+66356338613666303863393937626365376631643666363830613836333236383466353835306535
+63313939386335313936376233626231343062323662313565653439306534386133396336623265
+30326334373433386639626362396138346234346630383930373636616239353734356432356237
+33636135353736313961303730386433346433663332363465343732353132356162383936343238
+35633866303031663238666662366137316366333564336134393465383438616465656666653664
+37383231623136363163663562343938653631316131613864663936363336343465343931613830
+61633166663534643765306337316635633163326238353561376631353661386437363935353636
+35623831366532393061343764633735396363623161373661316238303639396166643430323432
+36363137303834643233616331623764343161623264653531373431646364376662376238353233
+62626464393336653530383434353066353865333139323363396635393530616332383463373032
+36363665653234313263333334393535333961393063303366393034333734626235313835313665
+39376330346132343035653531396430656231646631653131633064643530363561393665663661
+64636133623231396663393662333738653631356436646166356531303066636139376166353830
+36626461646635323730326463323065393061356633653931663334633532663834323332363534
+34306539386532386365313766343462656264653332346363366231663764633436343334343235
+61653465303635353062333232396261336139633561373034396533383933373933356462666134
+32323631353536663761663439353162633539346561396166303738376432383533643766366465
+61373536663836613237366666646133343532376461323139643565396135366533356439306438
+62643235316231663564326238386238353536356330363236313064333862366336636363323834
+33336236313939316162393964346363363236383263363638336531623463643338323461326338
+33626430343834623466666461396534326466393934643631306637633562623531643636343031
+35626637363265306563643463666337316633613263353363306330613064306664343735353265
+38623033623364626437353434653732636161303732326239633837346336343666386138383935
+63626238663630366630366635356531303564663866616563393164346564643338666561396432
+37396439393866666661353463623865333863613765353264306633636239656530303230373537
+61336634383861633165366265313136343464396464663136393864623436626537313935663831
+64386162356665616331383839373533363161623630663431663136643732353065376161336564
+36663931383033313130643831306364663365313265313831373636643861303261626130326234
+36613038356132343936346463636463356332303261663830373333346435316364383161643065
+35323262373736626636343562313731646234373464633664663562366364656466323737356435
+63653266356265633163386337333731316266663032656131346134353264306436366466393464
+66653662333464646437636439313565333465366339383365666538376464653563313835343561
+35373661353832643363363266343561613066343138636339633033343932643633633035616232
+39336635636135666461643134636435326433613331353035656232313662343735663833353234
+39653337386430353364373237313533373933383333346536356337356535653531303532663235
+36323531643735666538323838323932623438646236613330383863393836393365363636626232
+34393239383236626537303666393532626335396434363763356466326633363464646565323431
+35383934613964663839343332353539653136306566653763396564343538643663366636306331
+63386531326635373134353564316532353333383834376332306237336366616532363034383866
+32326133333932323861373433376662343537343935663864346537633063316561316538666431
+32623863373432363264373637373864396363353933303762373662626364653434363738393234
+64616464633433376336356236376635623232306264316464616465636139363861666435316563
+66396630346437616433613665303462653662376563623763633466653166643536376466323133
+64626630376338666164353839323062303132663633343937643761356535633238356634626165
+62363237336264623932613835303236623333316564393338633861313333666466346435323766
+35626432373737653138653931616562396161363037613339323961633534623537666637626133
+61653637306531646239383639333366643937393932623131383335616436663863393064323833
+35306635386336613037383761653638643930303334386139623135313434346232316233373632
+38393737636132333138636534383565666230323831303964333132656663383838386538656537
+36316166653239323162326333383035346636366163636233393936613563333032653339623264
+35303766623730653939383439643265343365363064336430356431666163656661666330323563
+33383761326562333937396535303366373136653163643138393931323838313531383264386463
+63316230333735396538613561313132613861336166663238613730323438383830643963356230
+66343933656536356136633065663037663233623662393133353739343065333438333235333836
+39613962376238643933653131363261313164333333383032613235653136326262623461663032
+36326164323036386562313638623331663166633039373264323333386635363437373839393432
+31363564643536613530383066383530643537353263366565346533343761353530313739346137
+38616335386539363861306232326330386563663433663132383938323866646564383864333864
+64663733333961373730366137656563376562366366646135383662333831636462623762356563
+65313433363633343662316337306638383132613131393765653135366631633561356138353730
+61313135326366373837303130663466353563313465613932633863383664306262653833346462
+32393566666566656339326531343265316631623230383130343633333535643939343733343161
+64336639666233383865386533326437613630613536303063656631346463353564613030366662
+35313331303564663835393439623730633031363435366363376230346432333834663933313834
+37653561626430363962646136633865353138323835633062666631626436653461303966386164
+31616235623932356136663763623263626331343131323933356439316430336564653630653836
+38326538666265306230396461376635386464656637363461623639356531313939613363373461
+34366136616238373731333962613437383563653161323337336135356462346431343064386463
+36613235353263623430333035376133353966373130316134303639303865323534386239386632
+31313935343336303535653861363036363461373537336561363532626137623066663932343037
+37333164356232343763613464326234343230616362326333643665643261656266336638303330
+36626133333166386661393833356661383337336136336537656233326666383133623637396264
+64316264616439313565306666616238336661363365633833623263333363623132383830346130
+35366234323837646531366330333632616133333364343766393233333237373836323837666161
+63643138376538363639353330373136376564643261623731313931333666353239333561663432
+65396663373436666236376434666632376335353566353530393533633132366130663038643264
+37313832613732353230306135363466616162313137343436653064343231356433366563303738
+35623531636631613061653963656664313038633434316336333633316661306563643262646334
+33613563386330376333663133653138336234386366316538383362383665643361386366386538
+65396534643064303332366532663834366537626261316139326236356136343136383638333339
+36346530356565666332613037373364353366386130313464626565323730316132336262323264
+36633532326534343362656465306535653539613265323634393865646235653363626637383339
+32346264306561383332366462613236316364393931316132323937623763393935313830346430
+64383236333664353431363934303132313434326534646239363366626530643536646230663139
+65316466313562316266653665636361363734393461396630643637623462343866646265633838
+39633137643937656438643433663765363430313337343166366161323434663439353562666132
+38623464623962343534393064376237373231333939323666306465306134336234383932353635
+62656337636465326532613139626462323162303730663837313935633437313265353930663463
+38626231323462363461373131306261326463313763623737303466353835643931653334653132
+65626639396365646333653064396662626566646666306362366334363934646237663830393962
+31343561613162396632396336653834616663643130363131383463613265393337613866353365
+62653737373132616335643731646236363263366433653965393736333766393262613836333365
+34306635666366636430393365626364633061356165353661326563636366346562643733353334
+63316437376330656661633661393362323133666434366565633436363034363039373761633032
+37393163613131383537616434373730303664663562656333653232313937633164363236303663
+32363065366634363731313534343566623830663361663430333061383765363137366662623139
+66346334333061303437396532343330346366396362366362323535306639333962636232363730
+33343236636163666136373264666236386361306337653564623637626135613562303636613535
+38633130396532313362616666636238343035313233323661373032646432626262643662616262
+61353166363330323665616561643736326236363438353636373063373738383361653539303131
+30366364653464373662653066363865626338613433316362393564653739636635333562333036
+30376530323462626264373235313231313163393838633437326265646638373439336638636166
+64323762373835316138636137363166616161616633613632333063323632626637653630346562
+33376334616439376161643038666438373833343632643934303164353866613231346262346261
+61663265366461613634
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
 [ungrouped]
-jackson ansible_host=direct.jackson.alexav.gg ansible_user=iac
+jade ansible_host=fntz.net ansible_user=alex
+jackson ansible_host=direct.jackson.alexav.gg ansible_user=root
 nas ansible_host=172.16.0.29 ansible_user=alex
-bear ansible_host=172.16.0.44 ansible_user=iac
--- a/main.yml
+++ b/main.yml
@@ -1,23 +1,18 @@
- hosts: bear
+- hosts: jade
+
  roles:
    - role: traefik
      tags: traefik_deploy
      vars:
-        server: "bear"
+        server: "jade"

  tasks:
-    - name: Deploy Postgres
-      import_tasks: tasks/postgres.yml
-      tags: postgres_deploy
-    - name: Deploy MariaDB
-      import_tasks: tasks/mariadb.yml
-      tags: mariadb_deploy
-    - name: Deploy AdGuard Home
-      import_tasks: tasks/adguard.yml
-      tags: adguard_deploy
    - name: Deploy Glance
      import_tasks: tasks/glance.yml
      tags: glance_deploy
+    - name: Deploy Servarr
+      import_tasks: tasks/servarr.yml
+      tags: servarr_deploy
    - name: Deploy Dozzle
      import_tasks: tasks/dozzle.yml
      tags: dozzle_deploy
@@ -27,60 +22,66 @@
    - name: Deploy Homebridge
      import_tasks: tasks/homebridge.yml
      tags: homebridge_deploy
+    - name: Deploy PiHole
+      import_tasks: tasks/pihole.yml
+      tags: pihole_deploy
+    - name: Deploy PocketID
+      import_tasks: tasks/pocketid.yml
+      tags: pocketid_deploy
+    - name: Deploy NZBGet
+      import_tasks: tasks/nzbget.yml
+      tags: nzbget_deploy
+    - name: Deploy Tautulli
+      import_tasks: tasks/tautulli.yml
+      tags: tautulli_deploy
    - name: Deploy Tinyauth
      import_tasks: tasks/tinyauth.yml
      tags: tinyauth_deploy
    - name: Deploy Code Server
      import_tasks: tasks/codeserver.yml
      tags: codeserver_deploy
-    - name: Deploy PocketID
-      import_tasks: tasks/pocketid.yml
-      tags: pocketid_deploy
-    - name: Deploy Scrobbling Setup
-      import_tasks: tasks/scrobbling.yml
-      tags: scrobbling_deploy
-    - name: Deploy Monitoring
-      import_tasks: tasks/monitoring.yml
-      tags: monitoring_deploy
-    - name: Deploy Vaultwarden
-      import_tasks: tasks/vaultwarden.yml
-      tags: vaultwarden_deploy
-    - name: Deploy Tautulli
-      import_tasks: tasks/tautulli.yml
-      tags: tautulli_deploy
-    - name: Deploy Immich
-      import_tasks: tasks/immich.yml
-      tags: immich_deploy
-    - name: Deploy Plex
-      import_tasks: tasks/plex.yml
-      tags: plex_deploy
-    - name: Deploy Frigate
-      import_tasks: tasks/frigate.yml
-      tags: frigate_deploy
-    - name: Deploy Servarr
-      import_tasks: tasks/servarr.yml
-      tags: servarr_deploy
-    - name: Deploy NZBGet
-      import_tasks: tasks/nzbget.yml
-      tags: nzbget_deploy
-    - name: Deploy Gitea Runner
-      import_tasks: tasks/runner.yml
-      tags: runner_deploy
-    - name: Deploy Uptime Kuma
-      import_tasks: tasks/uptime-kuma.yml
-      tags: uptime-kuma_deploy
-    - name: Deploy Duplicati
-      import_tasks: tasks/duplicati.yml
-      tags: duplicati_deploy
+    - name: Deploy Dashdot
+      import_tasks: tasks/dashdot.yml
+      tags: dashdot_deploy
    - name: Deploy Romm
      import_tasks: tasks/romm.yml
      tags: romm_deploy
-    - name: Deploy Booklore
-      import_tasks: tasks/booklore.yml
-      tags: booklore_deploy
-    - name: Deploy Marreta
-      import_tasks: tasks/marreta.yml
-      tags: marreta_deploy
+    - name: Deploy Owncloud
+      import_tasks: tasks/owncloud.yml
+      tags: owncloud_deploy
+    - name: Deploy Excalidraw
+      import_tasks: tasks/excalidraw.yml
+      tags: excalidraw_deploy
+    - name: Deploy Vaultwarden
+      import_tasks: tasks/vaultwarden.yml
+      tags: vaultwarden_deploy
+    - name: Deploy Immich
+      import_tasks: tasks/immich.yml
+      tags: immich_deploy
+    - name: Deploy Drop
+      import_tasks: tasks/drop.yml
+      tags: drop_deploy
+    - name: Deploy Gluetun
+      import_tasks: tasks/gluetun.yml
+      tags: gluetun_deploy
+    - name: Deploy QBittorrent
+      import_tasks: tasks/qbittorrent.yml
+      tags: qbittorrent_deploy
+    - name: Deploy Jackett
+      import_tasks: tasks/jackett.yml
+      tags: jackett_deploy
+    - name: Deploy Uptime Kuma
+      import_tasks: tasks/uptime-kuma.yml
+      tags: uptime-kuma_deploy
+    - name: Deploy CouchDB for obsidian
+      import_tasks: tasks/obsidian.yml
+      tags: obsidian_deploy
+    - name: Deploy Pterodactyl
+      import_tasks: tasks/pterodactyl.yml
+      tags: pterodactyl_deploy
+    - name: Deploy Termix
+      import_tasks: tasks/termix.yml
+      tags: termix_deploy

 - hosts: jackson

@@ -89,6 +90,8 @@
      tags: traefik_deploy
      vars:
        server: "jackson"
+    - role: fivem
+      tags: fivem_deploy

  tasks:
    - name: Deploy Gitea
@@ -103,21 +106,12 @@
    - name: Deploy Plausible
      import_tasks: tasks/plausible.yml
      tags: plausible_deploy
-    - name: Deploy Pelican
-      import_tasks: tasks/pelican.yml
-      tags: pelican_deploy
-    - name: Deploy Database
-      import_tasks: tasks/mariadb.yml
-      tags: mariadb_deploy
-    - name: Deploy Floof
-      import_tasks: tasks/floof.yml
-      tags: floof_deploy
-    - name: Deploy Tinyauth
-      import_tasks: tasks/tinyauth.yml
-      tags: tinyauth_deploy
-    - name: Deploy Cobalt
-      import_tasks: tasks/cobalt.yml
-      tags: cobalt_deploy
+    - name: Deploy Owncloud
+      import_tasks: tasks/owncloud.yml
+      tags: owncloud_deploy
+    - name: Deploy Wings
+      import_tasks: tasks/wings.yml
+      tags: wings_deploy

 - hosts: nas

@@ -128,6 +122,15 @@
        server: "nas"

  tasks:
+    - name: Deploy Plex
+      import_tasks: tasks/plex.yml
+      tags: plex_deploy
+    - name: Deploy Frigate
+      import_tasks: tasks/frigate.yml
+      tags: frigate_deploy
+    - name: Deploy Ersatz
+      import_tasks: tasks/ersatztv.yml
+      tags: ersatztv_deploy
    - name: Deploy Wings
      import_tasks: tasks/wings.yml
      tags: wings_deploy
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -12,11 +12,6 @@
    dest: "{{ build.git.dest }}"
  when: build is defined

- name: Create Docker volume
-  docker_volume:
-    name: "{{ volume_name }}"
-  when: volume_name is defined
-
 - name: Build Docker Image
  docker_image:
    name: "{{ image.name }}"
@@ -30,6 +25,12 @@
    state: present
  when: build is defined

+- name: Pull latest Docker image
+  docker_image:
+    name: "{{ image.name }}"
+    tag: "{{ image.tag }}"
+    source: pull
+
 - name: Create Docker Network
  docker_network:
    name: "{{ network_name }}"
@@ -38,22 +39,11 @@
 - name: Create Docker Container
  docker_container:
    name: "{{ name }}"
-    recreate: true
-    restart_policy: always
-    entrypoint: "{{ entrypoint | default(omit) }}"
-    shm_size: "{{ shmSize | default(omit) }}"
-    pull: "{{ build is not defined }}"
-    published_ports: "{{ published_ports | default(omit) }}"
-    network_mode: "{{ network_mode | default(omit) }}"
    image: "{{ image.name }}:{{ image.tag }}"
-    etc_hosts: "{{ extra_hosts | default(omit) }}"
    command: "{{ command | default(omit) }}"
-    networks: "{{ networks | default(omit) }}"
+    recreate: true
+    restart_policy: unless-stopped
+    networks: "{{ networks }}"
    volumes: "{{ volumes | default(omit) }}"
    env: "{{ env | default(omit) }}"
    labels: "{{ labels | default(omit) }}"
-    healthcheck: "{{ healthcheck | default(omit) }}"
-    devices: "{{ devices | default(omit) }}"
-    mounts: "{{ mounts | default(omit) }}"
-    pid_mode: "{{ pid_mode | default(omit) }}"
-    privileged: "{{ privileged | default(omit) }}"
--- a/roles/gitea-runner/tasks/main.yml
+++ b/roles/gitea-runner/tasks/main.yml
@@ -0,0 +1,48 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/gitea"
+    - "{{ data_dir }}/job"
+
+- name: Check if Act Runner has been downloaded
+  stat:
+    path: "{{ data_dir }}/gitea/act_runner"
+  register: act_runner
+
+- name: Download Gitea Act Runner
+  get_url:
+    url: https://dl.gitea.com/act_runner/nightly/act_runner-nightly-linux-amd64
+    dest: "{{ data_dir }}/gitea"
+    mode: 0755
+  when: not act_runner.stat.exists
+
+- name: Copy Gitea Act Runner Config
+  template:
+    src: config.yml.j2
+    dest: "{{ data_dir }}/gitea/config.yml"
+
+- name: Check if Act Runner is a Systemd Service
+  stat:
+    path: "/etc/systemd/system/act_runner.service"
+  register: act_runner_service
+
+- name: Stop & remove systemd service
+  become: yes
+  shell: |
+    systemctl stop act_runner.service &&
+    rm /etc/systemd/system/act_runner.service
+- name: Create Systemd Service
+  become: yes
+  template:
+    src: act_runner.service.j2
+    dest: "/etc/systemd/system/act_runner.service"
+
+- name: Enable Systemd Service
+  become: yes
+  command: systemctl enable act_runner.service
+- name: Start Systemd Service
+  become: yes
+  command: systemctl start act_runner.service
--- a/roles/gitea-runner/templates/act_runner.service.j2
+++ b/roles/gitea-runner/templates/act_runner.service.j2
@@ -0,0 +1,16 @@
+[Unit]
+Description=Gitea Actions runner
+Documentation=https://gitea.com/gitea/act_runner
+After=docker.service
+
+[Service]
+ExecStart={{ data_dir }}/gitea/act_runner daemon --config={{ data_dir }}/gitea/config.yml
+ExecReload=/bin/kill -s HUP $MAINPID
+WorkingDirectory={{ data_dir }}/gitea
+TimeoutSec=0
+RestartSec=10
+Restart=always
+User=alex
+
+[Install]
+WantedBy=multi-user.target
--- a/roles/gitea-runner/templates/config.yml.j2
+++ b/roles/gitea-runner/templates/config.yml.j2
@@ -0,0 +1,16 @@
+log:
+  level: info
+
+runner:
+  file: .runner
+  capacity: 1
+  timeout: 3h
+  shutdown_timeout: 0s
+  insecure: false
+  fetch_timeout: 5s
+  fetch_interval: 2s
+  labels:
+    - "runner:host"
+
+host:
+  workdir_parent: "{{ data_dir }}/gitea/job"
--- a/roles/traefik/tasks/main.yml
+++ b/roles/traefik/tasks/main.yml
@@ -25,17 +25,12 @@
  template:
    src: local-dynamic.yml.j2
    dest: "{{ data_dir }}/traefik/dynamic.yml"
-  when: server == "jade" or server == "nas" or server == "bear"
+  when: server == "jade" or server == "nas"
 - name: Create Traefik Dynamic File (Remote)
  template:
    src: remote-dynamic.yml.j2
    dest: "{{ data_dir }}/traefik/dynamic.yml"
  when: server == "jackson"
- name: Create Traefik Dynamic File (Remote 2)
-  template:
-    src: remote-ash-1.yml.j2
-    dest: "{{ data_dir }}/traefik/dynamic.yml"
-  when: server == "ash-1"

 - name: Deploy Traefik Docker Container
  docker_container:
@@ -43,7 +38,6 @@
    image: traefik
    restart_policy: unless-stopped
    recreate: true
-    pull: true
    command:
      - --providers.file.directory=/config
    published_ports:
--- a/roles/traefik/templates/config.yml.j2
+++ b/roles/traefik/templates/config.yml.j2
@@ -12,11 +12,6 @@ entryPoints:
          scheme: https
  webSecure:
    address: ":443"
-    transport:
-      respondingTimeouts:
-        readTimeout: 600s
-        writeTimeout: 600s
-        idleTimeout: 180s
 serversTransport:
  insecureSkipVerify: true
 providers:
--- a/roles/traefik/templates/local-dynamic.yml.j2
+++ b/roles/traefik/templates/local-dynamic.yml.j2
@@ -26,39 +26,52 @@ http:
        - webSecure
      tls:
        certResolver: letsencrypt
-    homebridge:
-      rule: "Host(`bridge.fntz.net`)"
-      service: homebridge
+    nflproxy:
+      rule: "Host(`nfl.fntz.net`)"
+      service: nflproxy
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
-    wings:
-      rule: "Host(`wings.fntz.net`)"
-      service: wings
+    nvr:
+      rule: "Host(`nvr.fntz.net`)"
+      service: nvr
+      middlewares: tinyauth
+      entryPoints:
+        - webSecure
+      tls:
+        certResolver: letsencrypt
+    iptv:
+      rule: "Host(`iptv.fntz.net`)"
+      service: iptv
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
    
+  
  services:
    plex:
      loadBalancer:
        servers:
-          - url: "http://172.16.0.44:32400"
+          - url: "http://172.16.0.29:32400"
    jtraefik:
      loadBalancer:
        servers:
-          - url: "http://100.105.157.6:8080/"
+          - url: "http://jackson:8080/"
    traefik:
      loadBalancer:
        servers:
-          - url: "http://172.16.0.44:8080/"
-    homebridge:
+          - url: "http://jade:8080/"
+    nflproxy:
      loadBalancer:
        servers:
-          - url: "http://172.16.0.44:8581/"
-    wings:
+          - url: "http://jade:5000/"
+    nvr:
      loadBalancer:
        servers:
-          - url: "http://jade:8090/"
+          - url: "http://172.16.0.29:5000/"
+    iptv:
+      loadBalancer:
+        servers:
+          - url: "http://nas:8409/"
--- a/roles/traefik/templates/remote-ash-1.yml.j2
+++ b/roles/traefik/templates/remote-ash-1.yml.j2
@@ -1,15 +0,0 @@
-http:
-  routers:
-    wings:
-      rule: "Host(`ash-1.landite.games`)"
-      service: wings
-      entryPoints:  
-        - webSecure
-      tls:
-        certResolver: letsencrypt
-    
-  services:
-    wings:
-      loadBalancer:
-        servers:
-          - url: "http://5.161.219.50:8090"
--- a/roles/traefik/templates/remote-dynamic.yml.j2
+++ b/roles/traefik/templates/remote-dynamic.yml.j2
@@ -1,15 +1,18 @@
 http:
+  middlewares:
+    landiteRedirect:
+      redirectRegex:
+        regex: ".*"
+        replacement: "https://alexav.gg/?ref=landite"
+        permanent: true
+
  routers:
-    wings:
-      rule: "Host(`wings.landite.games`)"
-      service: wings
+    landite:
+      rule: "Host(`landite.games`)"
+      middlewares:
+        - landiteRedirect
+      service: noop@internal
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
-    
-  services:
-    wings:
-      loadBalancer:
-        servers:
-          - url: "http://5.161.64.174:8090"
--- a/scripts/deploy_containers.py
+++ b/scripts/deploy_containers.py
@@ -7,15 +7,25 @@ def git_diff():
  res = subprocess.run(f"git diff --name-only {args[1]} {args[2]}", capture_output=True, shell=True, text=True)
  return [x for x in res.stdout.strip().split("\n") if "tasks/" in x or "roles/" in x]

-def construct_command(tags):
-  command = f"ANSIBLE_CONFIG=ansible.cfg /usr/bin/ansible-playbook main.yml --tags={",".join(tags)} --vault-password-file ~/.vault_pass.txt"
-  print(command)
+def construct_command(tag = None, host = None):
+  command = f"ANSIBLE_CONFIG=ansible.cfg /usr/bin/ansible-playbook main.yml --vault-password-file ~/.vault_pass.txt"
+
+  if host:
+    command += f" -l {host}"
+  if tag:
+    command += f" --tags {tag}_deploy"
+
  return command

-def deploy(tags):
-  print(f"[MAIN] Deploying...")
-  command = construct_command(tags)
-  res = subprocess.run(command, shell=True)
+def deploy(tag = None, host = None):
+  command = construct_command(tag, host)
+  
+  if tag:
+    print(f"Deploying {tag}...\n")
+  else:
+    print(f"Deploying {host}...\n")
+  res = subprocess.run(command, shell=True, stdout=subprocess.DEVNULL)
+
  return res.returncode == 0

 def main():
@@ -28,10 +38,10 @@ def main():
    "tasks/qbittorrent.yml",
    "tasks/jackett.yml"
  ]
-  ignore_deploys_for = [
-    "tasks/runner",
-    "templates/runner",
-    "roles/docker"
+  managed_roles = [
+    "roles/fivem",
+    "roles/gitea-runner",
+    "roles/traefik"
  ]

  # special actions
@@ -44,56 +54,65 @@ def main():
  # clean up the diff
  new_diff = []
  for file in diff:
-    split_string = file.split("/")
-    service_name = split_string[1].split(".")[0] + "_deploy" if "." in split_string[1] else split_string[1] + "_deploy"
+    task_name = f"{file.split("/")[0]}/{file.split("/")[1]}"

    # i'm not proud of this either
    if not os.path.exists(os.path.join(dir_path, file)):
-      if "roles" in file and not os.path.exists(os.path.join(dir_path, service_name)):
+      if "roles" in file and not os.path.exists(os.path.join(dir_path, task_name)) and task_name in managed_roles:
        print(f"[MAIN] '{task_name}' role removed, marking for cleanup..")
-        removed_containers.append(service_name)
+        removed_containers.append(task_name)
      elif "tasks" in task_name:
        print(f"[MAIN] '{task_name}' non-existent, marking for cleanup..")
-        removed_containers.append(service_name) 
+        removed_containers.append(task_name) 
+    elif "roles" in file:      
+      if task_name in managed_roles:
+        if task_name not in new_diff:
+          new_diff.append(task_name)
+    elif "tasks" in file:
+      new_diff.append(file.split(".")[0])
    else:
-      if service_name not in ignore_deploys_for and service_name not in new_diff:
-        new_diff.append(service_name)
+      new_diff.append(file)

-  if len(new_diff) > 0:
-    deployed = deploy(new_diff)
+  deployed = []
+  failed = []
+  for task in new_diff:
+    deployment = deploy(tag=task)
+
+    if not deployment:
+      failed.append(task)
    else:
-    # success, nothing deployed
-    deployed = True
+      deployed.append(task)

  for task in removed_containers:
    print(f"[MAIN] Attempting to remove containers related to '{task}'...")
-    if len(task.split("/")) > 1:
    task_name = task.split("/")[1].split(".")[0]
-    else:
-      task_name = task

-    containers = subprocess.Popen(f'docker ps --filter "name={task_name}" -q', shell=True, stdout=subprocess.PIPE)
+    containers = subprocess.Popen(f"docker container list | grep {task_name}_", shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    for line in containers.stdout:
-      container_id = line.strip().decode("utf8")
-      print(f"[MAIN] Found Docker container {container_id} related to {task_name}, removing..")
-      subprocess.run(f"/usr/bin/docker container stop {container_id}", shell=True)
-      subprocess.run(f"/usr/bin/docker container rm {container_id}", shell=True)
-      subprocess.run("/usr/bin/docker image prune -f", shell=True)
-      subprocess.run("/usr/bin/docker container prune -f", shell=True)
+      docker_container_id = line.rstrip().decode('utf8').split(" ")[0]
+      if docker_container_id and docker_container_id.strip() != "":
+        print(f"[MAIN] Found Docker container {docker_container_id} related to {task}, removing..")

-  if deployed and len(new_diff) > 0: 
+        # clean up containers & dangling images
+        subprocess.run(f"/usr/bin/docker container stop {docker_container_id}", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run(f"/usr/bin/docker container rm {docker_container_id}", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run("/usr/bin/docker image prune -f", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run("/usr/bin/docker container prune -f", shell=True, stdout=subprocess.DEVNULL)
+
+  if len(failed) <= 0 and len(deployed) > 0:
    print("\n---------------------")
    print(" Deployment succeeded!")
-    print(f" All tasks: {', '.join(new_diff)}")
+    print(f" All tasks: {", ".join(deployed)}")
    print("---------------------\n")
    sys.exit(0)
-  elif not deployed and len(new_diff) > 0:
+  elif len(failed) > 0:
    print("\n---------------------")
    print(" Deployment failed!")
-    print(f" All tasks: {', '.join(new_diff)}")
+    print(f" Failed tasks: {", ".join(failed)}")
+    print(f" All tasks: {", ".join(deployed)}")
    print("---------------------\n")
    sys.exit(1)
-  elif len(new_diff) <= 0:
+  elif len(deployed) <= 0:
    print("[MAIN] Successfully executed, no tasks required execution")
    sys.exit(0)

--- a/scripts/extract_to_template.py
+++ b/scripts/extract_to_template.py
@@ -10,30 +10,12 @@ if os.path.exists(host_vars_path):
    
  vaults = os.listdir(host_vars_path)

-  # 1st run - extract ungrouped, global variables
  for vault in vaults:
    vault_path = os.path.join(host_vars_path, vault)
    vault_contents = subprocess.run(f'ansible-vault decrypt "{vault_path}" --vault-password-file ~/.vault_pass.txt --output -', shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
    stdout = vault_contents.stdout.strip().splitlines()

    for line in stdout:
-      if line.startswith("#"):
-        break
-      elif line.split(":")[0] not in file_contents:
-        file_contents += f"{line.split(":")[0]}:\n"
-        
-  # 2nd run - extract service-specific variables
-  for vault in vaults:
-    vault_path = os.path.join(host_vars_path, vault)
-    vault_contents = subprocess.run(f'ansible-vault decrypt "{vault_path}" --vault-password-file ~/.vault_pass.txt --output -', shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-    stdout = vault_contents.stdout.strip().splitlines()
-
-    has_found_start = False
-    for line in stdout:
-      if has_found_start or line.startswith("#"):
-        if not has_found_start:
-          has_found_start = True
-        
      if line.startswith("#") and line not in file_contents:
        file_contents += f"\n{line}\n"

--- a/scripts/run_updates.py
+++ b/scripts/run_updates.py
@@ -13,8 +13,8 @@ def search_for_image(image_name):
      data = yaml.safe_load(file)

      for key in data:
-        if "vars" in key:
-          if image_name in key["vars"]["image"]["name"] or image_name == key["vars"]["image"]["name"]:
+        if "docker_image" in key:
+          if image_name in key["docker_image"]["name"]:
            return f"{task.split(".")[0]}_deploy"

 def main():
@@ -26,40 +26,27 @@ def main():
  with open("main.yml", 'r') as file:
    data = yaml.safe_load(file)
    for host in data:
-      if "tasks" in host:
      for task in host['tasks']:
        deployable_tags.append(task['tags'])

-  if len(update_list["images"]) > 0:
-    already_deployed = []
-    actually_updatable = []
-    blacklist = []
+  if len(update_list["images"]) <= 0:
+    print("No images to update!")
+  else:
+    print(f"Updating {update_list["metrics"]["updates_available"]} image(s)..\n")

    for image in update_list["images"]:
      if image['result']['has_update']:
-        if image in blacklist:
-          print(f"[UPDATE] Ignoring '{image}' due to its blacklist")
-        elif 'version_update_type' in image['result']['info'] and image['result']['info']['version_update_type'] != "major":
-          actually_updatable.append({ 'reference': image['reference'], 'repository': image['parts']['repository'] })
-        elif 'type' in image['result']['info'] and image['result']['info']['type'] == "digest":
-          actually_updatable.append({ 'reference': image['reference'], 'repository': image['parts']['repository'] })
+        if "remote_digest" in image["result"]["info"]:
+          image_name = image["parts"]["repository"]
+          ansible_tag = search_for_image(image_name) 

-    print(f"Redeploying {len(actually_updatable)} container(s)..")
-    for image in actually_updatable:
-      ansible_tag = search_for_image(image['repository'])
-      print(ansible_tag, image['reference'])
-      if ansible_tag and ansible_tag in deployable_tags and ansible_tag not in already_deployed:
-        print(f'[UPDATE] Deploying {ansible_tag}..')
+          if ansible_tag and ansible_tag in deployable_tags:
+            print(f"Updating '{image_name}' ({ansible_tag})..")
+            subprocess.run(f'docker image pull {image_name}', shell=True)
            subprocess.run(f'ANSIBLE_CONFIG=ansible.cfg ansible-playbook main.yml --tags {ansible_tag} --vault-password-file=~/.vault_pass.txt', shell=True)
-      else:
-        print('[UPDATE] Could not find corresponding task, cleaning up..')
-        subprocess.run(f"docker image remove {image['reference']}", shell=True)
-      already_deployed.append(ansible_tag)

    print("\nAll images updated, refreshing Cup")
    requests.get("https://cup.fntz.net/api/v3/refresh")
-  else:
-    print("No images to update!")

 if __name__ == "__main__":
  main()
--- a/tasks/adguard.yml
+++ b/tasks/adguard.yml
@@ -1,27 +0,0 @@
---
- name: Deploy AdGuard Home
-  include_role:
-    name: docker
-  vars:
-    name: adguard
-    directories:
-      - "{{ data_dir }}/adguard"
-      - "{{ data_dir }}/adguard/work"
-      - "{{ data_dir }}/adguard/conf"
-    image:
-      name: adguard/adguardhome
-      tag: latest
-    volumes:
-      - "{{ data_dir }}/adguard/work:/opt/adguardhome/work"
-      - "{{ data_dir }}/adguard/conf:/opt/adguardhome/conf"
-    published_ports:
-      - "53:53/tcp"
-      - "53:53/udp"
-    networks:
-      - name: "homelab"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.adguard.rule: Host(`ag.fntz.net`)
-      traefik.http.routers.adguard.entrypoints: webSecure
-      traefik.http.routers.adguard.tls.certresolver: letsencrypt
-      traefik.http.services.adguard.loadbalancer.server.port: "3000"
--- a/tasks/api.yml
+++ b/tasks/api.yml
@@ -9,7 +9,7 @@
      - "{{ data_dir }}/api/db"
    image:
      name: postgres
-      tag: "17"
+      tag: latest
    networks:
      - name: api
    volumes:
@@ -40,8 +40,12 @@
    networks:
      - name: api
      - name: "{{ docker_network_name }}"
+    build:
+      git:
+        repo: git@git.alexav.gg:alex/api.git
+        dest: "{{ data_dir }}/api/app"
    image:
-      name: git.alexav.gg/alex/api
+      name: api
      tag: latest
    env:
      NODE_ENV: "production"
@@ -54,13 +58,6 @@
      STEAM_API_KEY: "{{ API_STEAM_API_KEY }}"
      CONTACT_WEBHOOK: "{{ API_CONTACT_WEBHOOK }}"
      JWT_KEY: "{{ API_JWT_KEY }}"
-      DISCORD_PUBLIC_KEY: "{{ API_DISCORD_PUBLIC_KEY }}"
-      DISCORD_APP_ID: "{{ API_DISCORD_APP_ID }}"
-      DISCORD_BOT_TOKEN: "{{ API_DISCORD_BOT_TOKEN }}"
-      MINECRAFT_HOST: "{{ API_MINECRAFT_HOST }}"
-      MINECRAFT_USER: "{{ API_MINECRAFT_USER }}"
-      MINECRAFT_PASSWORD: "{{ API_MINECRAFT_PASSWORD }}"
-      MINECRAFT_DATABASE: "{{ API_MINECRAFT_DATABASE }}"
    labels:
      traefik.enable: "true"
      traefik.http.routers.aapi.rule: Host(`api.alexav.gg`)
--- a/tasks/booklore.yml
+++ b/tasks/booklore.yml
@@ -1,33 +0,0 @@
---
- name: Deploy Booklore
-  include_role:
-    name: docker
-  vars:
-    name: booklore
-    networks:
-      - name: homelab
-    directories:
-      - "{{ data_dir }}/booklore"
-      - "{{ data_dir }}/booklore/data"
-      - "{{ data_dir }}/booklore/books"
-    image:
-      name: booklore/booklore
-      tag: latest
-    env:
-      APP_USER_ID: "{{ PUID }}"
-      APP_GROUP_ID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-      BOOKLORE_PORT: "6060"
-      DATABASE_URL: jdbc:mariadb://172.16.0.44:3306/booklore
-      DATABASE_USERNAME: booklore
-      DATABASE_PASSWORD: "{{ BOOKLORE_DB_PASS }}"
-    volumes:
-      - "{{ data_dir }}/booklore/data:/app/data"
-      - "{{ data_dir }}/booklore/books:/books"
-      - "{{ media_path }}/Books/Bookdrop:/bookdrop"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.booklore.rule: Host(`books.fntz.net`)
-      traefik.http.routers.booklore.entrypoints: webSecure
-      traefik.http.routers.booklore.tls.certresolver: letsencrypt
-      traefik.http.services.booklore.loadbalancer.server.port: "6060"
--- a/tasks/cobalt.yml
+++ b/tasks/cobalt.yml
@@ -1,20 +0,0 @@
---
- name: Deploy Cobalt
-  include_role:
-    name: docker
-  vars:
-    name: cobalt
-    image:
-      name: ghcr.io/imputnet/cobalt
-      tag: 11
-    env:
-      API_URL: "https://dl.alexav.gg"
-      TURNSTILE_SITEKEY: "{{ COBALT_TURNSTILE_SITEKEY }}"
-      TURNSTILE_SECRET: "{{ COBALT_TURNSTILE_SECRET }}"
-      JWT_SECRET: "{{ COBALT_JWT_SECRET }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.cobalt.rule: Host(`dl.alexav.gg`)
-      traefik.http.routers.cobalt.entrypoints: webSecure
-      traefik.http.routers.cobalt.tls.certresolver: letsencrypt
-      traefik.http.services.cobalt.loadbalancer.server.port: "9000"
--- a/tasks/dashdot.yml
+++ b/tasks/dashdot.yml
@@ -0,0 +1,19 @@
+---
+- name: Deploy Dashdot
+  include_role:
+    name: docker
+  vars:
+    name: dashdot
+    image:
+      name: mauricenino/dashdot
+      tag: latest
+    networks:
+      - name: homelab
+    volumes:
+      - "/:/mnt/host:ro"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.dash.rule: Host(`stats.fntz.net`)
+      traefik.http.routers.dash.entrypoints: webSecure
+      traefik.http.routers.dash.tls.certresolver: letsencrypt
+      traefik.http.services.dash.loadbalancer.server.port: "3001"
--- a/tasks/drop.yml
+++ b/tasks/drop.yml
@@ -1,14 +1,50 @@
 ---
- name: Deploy Drop
-  include_role:
-    name: docker
-  vars:
-    name: drop
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/drop"
+    - "{{ data_dir }}/drop/db"
    - "{{ data_dir }}/drop/app"
-    image:
+
+- name: Create Drop Network
+  docker_network:
+    name: drop
+
+- name: Pull latest Drop Docker Image
+  docker_image:
    name: ghcr.io/drop-oss/drop
-      tag: latest
+    tag: v0.3.3
+    source: pull
+
+- name: Create Drop DB Container
+  docker_container:
+    name: drop_postgres
+    image: postgres:14-alpine
+    recreate: true
+    restart_policy: unless-stopped
+    networks:
+      - name: drop
+    healthcheck:
+      test: pg_isready -d drop -U drop
+      retries: 5
+      start_period: 10s
+      interval: 30s
+      timeout: 60s
+    volumes:
+      - "{{ data_dir }}/drop/db:/var/lib/postgresql/data"
+    env:
+      POSTGRES_PASSWORD: "drop"
+      POSTGRES_USER: "drop"
+      POSTGRES_DB: "drop"
+
+- name: Create Drop Container
+  docker_container:
+    name: drop
+    image: ghcr.io/drop-oss/drop:latest
+    recreate: true
+    restart_policy: unless-stopped
    networks:
      - name: homelab
      - name: drop
@@ -16,7 +52,7 @@
      - "{{ media_path }}/Games/Desktop:/library"
      - "{{ data_dir }}/drop/app:/data"
    env:
-      DATABASE_URL: "postgres://drop:drop@172.16.0.25:5432/drop"
+      DATABASE_URL: "postgres://drop:drop@drop_postgres:5432/drop"
      GIANT_BOMB_API_KEY: "{{ DROP_GIANT_BOMB_API_KEY }}"
      EXTERNAL_URL: "https://games.fntz.net"
    labels:
--- a/tasks/duplicati.yml
+++ b/tasks/duplicati.yml
@@ -1,30 +0,0 @@
---
- name: Deploy Duplicati
-  include_role:
-    name: docker
-  vars:
-    name: duplicati
-    directories:
-      - "{{ data_dir }}/duplicati/app"
-      - "{{ data_dir }}/duplicati/backups"
-    image:
-      name: lscr.io/linuxserver/duplicati
-      tag: latest
-    volumes:
-      - "{{ data_dir }}/duplicati/app:/config"
-      - "{{ data_dir }}/duplicati/backups:/backups"
-      - "{{ share_path }}:/source:ro"
-      - "{{ DUPLICATI_SSH_KEY_PATH }}:/app/ssh/id_ed25519:ro"
-      - "{{ DUPLICATI_SSH_PUB_KEY_PATH }}:/app/ssh/id_ed25519.pub:ro"
-    env:
-      PUID: "1000"
-      PGID: "1000"
-      SETTINGS_ENCRYPTION_KEY: "{{ DUPLICATI_ENCRYPTION_KEY }}"
-    networks:
-      - name: "homelab"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.duplicati.rule: Host(`backups.fntz.net`)
-      traefik.http.routers.duplicati.entrypoints: webSecure
-      traefik.http.routers.duplicati.tls.certresolver: letsencrypt
-      traefik.http.services.duplicati.loadbalancer.server.port: "8200"
--- a/tasks/ersatztv.yml
+++ b/tasks/ersatztv.yml
@@ -0,0 +1,31 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/ersatz"
+
+- name: Pull latest Docker Image
+  docker_image:
+    name: ghcr.io/ersatztv/ersatztv
+    tag: latest
+    source: pull
+
+- name: Create Docker Container
+  docker_container:
+    name: ersatztv
+    image: ghcr.io/ersatztv/ersatztv:latest
+    recreate: true
+    restart_policy: unless-stopped
+    devices:
+      - /dev/dri/renderD128:/dev/dri/renderD128
+    mounts:
+      - type: tmpfs
+        target: /transcode
+        tmpfs_size: 5G
+    volumes:
+      - "{{ data_dir }}/ersatz:/config"
+      - "{{ media_path }}:{{ media_path }}:ro"
+    published_ports:
+      - "8409:8409"
--- a/tasks/excalidraw.yml
+++ b/tasks/excalidraw.yml
@@ -0,0 +1,17 @@
+---
+- name: Deploy Excalidraw
+  include_role:
+    name: docker
+  vars:
+    name: excalidraw
+    image:
+      name: excalidraw/excalidraw
+      tag: latest
+    networks:
+      - name: homelab
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.draw.rule: Host(`draw.fntz.net`)
+      traefik.http.routers.draw.entrypoints: webSecure
+      traefik.http.routers.draw.tls.certresolver: letsencrypt
+      traefik.http.services.draw.loadbalancer.server.port: "80"
--- a/tasks/floof.yml
+++ b/tasks/floof.yml
@@ -1,23 +0,0 @@
---
- name: Deploy Floof
-  include_role:
-    name: docker
-  vars:
-    name: floofs_adventure
-    directories:
-      - "{{ data_dir }}/floof"
-    networks:
-      - name: "{{ docker_network_name }}"
-    build:
-      git:
-        repo: git@git.alexav.gg:alex/floofs-adventure.git
-        dest: "{{ data_dir }}/floof"
-    image:
-      name: floofs-adventure
-      tag: latest
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.dz.rule: Host(`floof.alexav.gg`)
-      traefik.http.routers.dz.entrypoints: webSecure
-      traefik.http.routers.dz.tls.certresolver: letsencrypt
-      traefik.http.services.dz.loadbalancer.server.port: "3001"
--- a/tasks/frigate.yml
+++ b/tasks/frigate.yml
@@ -1,26 +1,37 @@
 ---
- name: Deploy Frigate
-  include_role:
-    name: docker
-  vars:
-    name: frigate
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/frigate"
-    image:
+
+- name: Pull latest Frigate Docker Image
+  docker_image:
    name: ghcr.io/blakeblackshear/frigate
    tag: stable
+    source: pull
+
+- name: Deploy Frigate Docker Container
+  docker_container:
+    name: frigate
+    image: ghcr.io/blakeblackshear/frigate:stable
+    recreate: true
    privileged: true
+    restart_policy: unless-stopped
+    published_ports:
+      - "5000:5000"
+      - "8555:8555/tcp"
+      - "8555:8555/udp"
+      - "8554:8554"
    devices:
-      - /dev/dri
-      - /dev/kfd
+      - /dev/dri/renderD128:/dev/dri/renderD128
    networks:
      - name: "{{ docker_network_name }}"
    volumes:
      - /etc/localtime:/etc/localtime:ro
      - "{{ data_dir }}/frigate:/config"
-      - "{{ media_path }}/Cameras:/media/frigate"
-    env:
-      LIBVA_DRIVER_NAME: radeonsi
+      - "{{ FRIGATE_RECORDINGS_PATH }}:/media/frigate"
    labels:
      traefik.enable: "true"
      traefik.http.routers.frigate.rule: Host(`nvr.fntz.net`)
--- a/tasks/gitea.yml
+++ b/tasks/gitea.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Gitea
-  include_role:
-    name: docker
-  vars:
-    name: gitea
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/gitea"
-    image:
+
+- name: Pull latest Gitea Docker Image
+  docker_image:
    name: docker.gitea.com/gitea
    tag: latest
+    source: pull
+
+- name: Create Gitea Docker Container
+  docker_container:
+    name: gitea
+    image: docker.gitea.com/gitea:latest
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: "{{ docker_network_name }}"
    volumes:
--- a/tasks/glance.yml
+++ b/tasks/glance.yml
@@ -14,9 +14,10 @@
    networks:
      - name: homelab
    env:
-      ADGUARD_USERNAME: "{{ GLANCE_ADGUARD_USERNAME }}"
-      ADGUARD_PASSWORD: "{{ GLANCE_ADGUARD_PASSWORD }}"
+      PIHOLE_TOKEN: "{{ GLANCE_PIHOLE_TOKEN }}"
      VIDEO_MACHINE: "{{ GLANCE_VIDEO_MACHINE }}"
+      JELLYFIN_URL: "{{ GLANCE_JELLYFIN_URL }}"
+      JELLYFIN_TOKEN: "{{ GLANCE_JELLYFIN_TOKEN }}"
    volumes:
      - "{{ data_dir }}/glance/config:/app/config"
      - "{{ data_dir }}/glance/assets:/app/assets"
--- a/tasks/home-assistant.yml
+++ b/tasks/home-assistant.yml
@@ -0,0 +1,31 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/homeassistant"
+
+- name: Pull HA Docker Image
+  docker_image:
+    name: ghcr.io/home-assistant/home-assistant:stable
+    source: pull
+
+- name: Deploy Home Assistant Container
+  docker_container:
+    name: home_assistant
+    image: ghcr.io/home-assistant/home-assistant:stable
+    recreate: true
+    restart_policy: unless-stopped
+    network_mode: host
+    privileged: true
+    volumes:
+      - "{{ data_dir }}/homeassistant:/config"
+      - "/etc/localtime:/etc/localtime"
+      - "/run/dbus:/run/dbus:ro"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.ha.rule: Host(`ha.fntz.net`)
+      traefik.http.routers.ha.entrypoints: webSecure
+      traefik.http.routers.ha.tls.certresolver: letsencrypt
+      traefik.http.services.ha.loadbalancer.server.url: "http://{{ TRAEFIK_HOST_IP }}:8123"
--- a/tasks/homebridge.yml
+++ b/tasks/homebridge.yml
@@ -1,14 +1,30 @@
 ---
- name: Deploy Homebridge
-  include_role:
-    name: docker
-  vars:
-    name: homebridge
-    directories:
-      - "{{ data_dir }}/homebridge/homebridge"
-    image:
+- name: Create Folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/homebridge"
+
+- name: Pull latest Homebridge Docker Image
+  docker_image:
    name: homebridge/homebridge
    tag: latest
+    source: pull
+
+- name: Create Homebridge Docker Container
+  docker_container:
+    name: homebridge
+    image: homebridge/homebridge:latest
+    restart_policy: unless-stopped
    network_mode: host
+    recreate: true
    volumes:
      - "{{ data_dir }}/homebridge:/homebridge"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.bridge.rule: Host(`bridge.fntz.net`)
+      traefik.http.routers.bridge.entrypoints: webSecure
+      traefik.http.routers.bridge.tls.certresolver: letsencrypt
+      traefik.http.services.bridge.loadbalancer.server.url: "http://{{ TRAEFIK_HOST_IP }}:8581"
+      traefik.http.routers.bridge.middlewares: tinyauth
--- a/tasks/immich.yml
+++ b/tasks/immich.yml
@@ -1,16 +1,34 @@
 ---
- name: Deploy Immich DB
-  include_role:
-    name: docker
-  vars:
-    name: immich_postgres
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/immich"
    - "{{ data_dir }}/immich/model-cache"
    - "{{ data_dir }}/immich/db"
-    image:
-      name: ghcr.io/immich-app/postgres
-      tag: 14-vectorchord0.4.3-pgvectors0.2.0
+
+- name: Pull latest Immich Server Docker Image
+  docker_image:
+    name: ghcr.io/immich-app/immich-server
+    tag: v2.1.0
+    source: pull
+
+- name: Create Immich Redis Docker Container
+  docker_container:
+    name: immich_redis
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fea8b3e67b15729d4bb70589eb03367bab9ad1ee89c876f54327fc7c6e618571
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: immich
+
+- name: Create Immich DB Docker Container
+  docker_container:
+    name: immich_postgres
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
+    restart_policy: unless-stopped
+    recreate: true
    volumes:
      - "{{ data_dir }}/immich/db:/var/lib/postgresql/data"
    env:
@@ -20,25 +38,13 @@
      POSTGRES_INITDB_ARGS: "--data-checksums"
    networks:
      - name: immich
-    network_name: immich
- name: Deploy Immich Redis
-  include_role:
-    name: docker
-  vars:
-    name: immich_redis
-    image:
-      name: docker.io/valkey/valkey
-      tag: 8-bookworm
-    networks:
-      - name: immich
- name: Deploy Immich Server
-  include_role:
-    name: docker
-  vars:
-    name: immich
-    image:
-      name: ghcr.io/immich-app/immich-server
-      tag: v2.1.0
+
+- name: Create Immich Server Docker Container
+  docker_container:
+    name: immich_server
+    image: ghcr.io/immich-app/immich-server:v2.1.0
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
      - name: immich
@@ -46,8 +52,6 @@
      - "{{ IMMICH_UPLOAD_LOCATION }}:/usr/src/app/upload"
      - "/etc/localtime:/etc/localtime:ro"
    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
      DB_HOSTNAME: "immich_postgres"
      REDIS_HOSTNAME: "immich_redis"
      DB_PASSWORD: "{{ IMMICH_DB_PASSWORD }}"
--- a/tasks/jellyfin.yml
+++ b/tasks/jellyfin.yml
@@ -0,0 +1,39 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/jellyfin"
+
+- name: Pull latest Jellyfin Docker Image
+  docker_image:
+    name: lscr.io/linuxserver/jellyfin
+    tag: latest
+    source: pull
+
+- name: Create Jellyfin Docker Container
+  docker_container:
+    name: jellyfin
+    image: lscr.io/linuxserver/jellyfin:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: homelab
+    published_ports:
+      - 8096:8096
+    volumes:
+      - "{{ data_dir }}/jellyfin:/config"
+      - "{{ JELLYFIN_TV_PATH }}:/data/tvshows"
+      - "{{ JELLYFIN_MOVIE_PATH }}:/data/movies"
+      - "{{ JELLYFIN_MUSIC_PATH }}:/data/music"
+    env:
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
+      TZ: "{{ TZ }}"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.jf.rule: Host(`jf.fntz.net`)
+      traefik.http.routers.jf.entrypoints: webSecure
+      traefik.http.routers.jf.tls.certresolver: letsencrypt
+      traefik.http.services.jf.loadbalancer.server.port: "8096"
--- a/tasks/kavita.yml
+++ b/tasks/kavita.yml
@@ -0,0 +1,35 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/kavita"
+
+- name: Pull latest Kavita Docker Image
+  docker_image:
+    name: lscr.io/linuxserver/kavita
+    tag: latest
+    source: pull
+
+- name: Deploy Kavita Docker Container
+  docker_container:
+    name: kavita
+    image: lscr.io/linuxserver/kavita
+    recreate: true
+    restart_policy: unless-stopped
+    volumes:
+      - "{{ data_dir }}/kavita:/config"
+      - "{{ media_path }}/Books:/books"
+    env:
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
+      TZ: "{{ TZ }}"
+    networks:
+      - name: homelab
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.read.rule: Host(`read.fntz.net`)
+      traefik.http.routers.read.entrypoints: webSecure
+      traefik.http.routers.read.tls.certresolver: letsencrypt
+      traefik.http.services.read.loadbalancer.server.port: "5000"
--- a/tasks/mariadb.yml
+++ b/tasks/mariadb.yml
@@ -1,41 +0,0 @@
---
- name: Deploy MariaDB Database
-  include_role:
-    name: docker
-  vars:
-    name: mariadb
-    directories:
-      - "{{ data_dir }}/db"
-      - "{{ data_dir }}/db/import"
-    image:
-      name: mariadb
-      tag: latest
-    published_ports:
-      - "3306:3306"
-    volumes:
-      - "{{ data_dir }}/db:/var/lib/mysql"
-      - "{{ data_dir }}/db/etc:/etc/mysql"
-      - "{{ data_dir }}/db/import:/mnt/import"
-    env:
-      MARIADB_USER: "{{ MARIADB_DB_USER }}"
-      MARIADB_ROOT_PASSWORD: "{{ MARIADB_DB_PASSWORD }}"
-
- name: Deploy PHPMyAdmin
-  include_role:
-    name: docker
-  vars:
-    name: phpmyadmin
-    image:
-      name: phpmyadmin
-      tag: latest
-    networks:
-      - name: "{{ docker_network_name }}"
-    env:
-      PMA_HOST: "{{ MARIADB_PMA_HOST }}"
-      PMA_PORT: "{{ MARIADB_PMA_PORT }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.pma.rule: Host(`{{ MARIADB_PMA_URL }}`)
-      traefik.http.routers.pma.entrypoints: webSecure
-      traefik.http.routers.pma.tls.certresolver: letsencrypt
-      traefik.http.services.pma.loadbalancer.server.port: "80"
--- a/tasks/marreta.yml
+++ b/tasks/marreta.yml
@@ -1,64 +0,0 @@
---
- name: Deploy Marreta
-  include_role:
-    name: docker
-  vars:
-    name: marreta
-    network_name: marreta
-    networks:
-      - name: homelab
-      - name: marreta
-    image:
-      name: ghcr.io/manualdousuario/marreta
-      tag: latest
-    env:
-      SITE_NAME: "Marreta"
-      SITE_DESCRIPTION: "Jackson Marreta Instance"
-      SITE_URL: "{{ MARRETA_APP_URL }}"
-      DNS_SERVERS: "1.1.1.1,8.8.8.8"
-      LANGUANGE: "en"
-      LOG_LEVEL: "info"
-      SELENIUM_HOST: "marreta_selenium-hub:4444"
-      CLEANUP_DATS: "7"
-      PROXY_LIST: "url"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.marreta.rule: Host(`ladder.fntz.net`)
-      traefik.http.routers.marreta.entrypoints: webSecure
-      traefik.http.routers.marreta.tls.certresolver: letsencrypt
-      traefik.http.services.marreta.loadbalancer.server.port: "80"
-
- name: Deploy Selenium Hub
-  include_role:
-    name: docker
-  vars:
-    name: marreta_selenium-hub
-    networks:
-      - name: marreta
-    image:
-      name: selenium/hub
-      tag: 4.27.0-20241204
-    env:
-      SE_ENABLE_TRACING: "false"
-      GRID_MAX_SESSION: "10"
-      GRID_BROWSER_TIMEOUT: "10"
-      GRID_TIMEOUT: "10"
-
- name: Deploy Selenium Chromium
-  include_role:
-    name: docker
-  vars:
-    name: marreta_selenium-chromium
-    shm_size: 2gb
-    networks:
-      - name: marreta
-    image:
-      name: selenium/node-chromium
-      tag: 4.27.0-20241204
-    env:
-      SE_EVENT_BUS_HOST: "marreta_selenium-hub"
-      SE_EVENT_BUS_PUBLISH_PORT: "4442"
-      SE_EVENT_BUS_SUBSCRIBE_PORT: "4443"
-      SE_ENABLE_TRACING: "false"
-      SE_NODE_MAX_SESSIONS: "10"
-      SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
--- a/tasks/monitoring.yml
+++ b/tasks/monitoring.yml
@@ -1,139 +0,0 @@
---
- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/monitoring"
-    - "{{ data_dir }}/monitoring/grafana"
-    - "{{ data_dir }}/monitoring/loki"
-    - "{{ data_dir }}/monitoring/promtail"
-    - "{{ data_dir }}/monitoring/prometheus"
-
-# copy configs for loki, promtail & prometheus
- name: Create Loki Configuration
-  template:
-    src: templates/monitoring/loki.yaml.j2
-    dest: "{{ data_dir }}/monitoring/loki/loki-config.yaml"
- name: Create Promtail Configuration
-  template:
-    src: templates/monitoring/promtail.yaml.j2
-    dest: "{{ data_dir }}/monitoring/promtail/promtail-config.yaml"
- name: Create Prometheus Configuration
-  template:
-    src: templates/monitoring/prometheus.yml.j2
-    dest: "{{ data_dir }}/monitoring/prometheus/prometheus.yml"
-
- name: Deploy Prometheus
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_prometheus
-    network_name: "monitoring"
-    networks:
-      - name: "monitoring"
-      - name: "homelab"
-    image:
-      name: prom/prometheus
-      tag: latest
-    volumes:
-      - "{{ data_dir }}/monitoring/prometheus:/etc/prometheus"
-      - "{{ data_dir }}/monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.prom.rule: Host(`prom.fntz.net`)
-      traefik.http.routers.prom.entrypoints: webSecure
-      traefik.http.routers.prom.tls.certresolver: letsencrypt
-      traefik.http.services.prom.loadbalancer.server.port: "9090"
-
- name: Deploy Promtail
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_promtail
-    image:
-      name: grafana/promtail
-      tag: latest
-    networks:
-      - name: monitoring
-    command: -config.file=/etc/promtail/config.yaml
-    volumes:
-      - "{{ data_dir }}/monitoring/promtail/promtail-config.yaml:/etc/promtail/config.yaml"
-      - "/var/log:/var/log:ro"
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
-
- name: Deploy Loki
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_loki
-    volume_name: grafana-loki
-    image:
-      name: grafana/loki
-      tag: latest
-    volumes:
-      - "{{ data_dir }}/monitoring/loki/loki-config.yaml:/etc/loki/local-config.yaml"
-      - "grafana-loki:/loki"
-    networks:
-      - name: "monitoring"
-
- name: Deploy Node Exporter
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_node-exporter
-    image:
-      name: prom/node-exporter
-      tag: latest
-    command:
-      - "--path.rootfs=host"
-    network_mode: host
-    pid_mode: host
-    volumes:
-      - "/:/host:ro,rslave"
-
- name: Deploy CAdvisor
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_cadvisor
-    image:
-      name: ghcr.io/google/cadvisor
-      tag: 0.55.1
-    networks:
-      - name: "monitoring"
-    volumes:
-      - "/:/rootfs:ro"
-      - "/var/run:/var/run:ro"
-      - "/sys:/sys:ro"
-      - "/var/lib/docker:/var/lib/docker:ro"
-      - "/dev/disk:/dev/disk:ro"
-    privileged: true
-    devices:
-      - /dev/kmsg
-
- name: Deploy Grafana
-  include_role:
-    name: docker
-  vars:
-    name: monitoring_grafana
-    volume_name: "grafana-storage"
-    networks:
-      - name: "monitoring"
-      - name: "homelab"
-    image:
-      name: grafana/grafana
-      tag: latest
-    user: "{{ PUID }}"
-    volumes:
-      - "grafana-storage:/var/lib/grafana"
-    env:
-      GF_AUTH_ANONYMOUS_ENABLED: "{{ GRAFANA_AUTH_ANONYMOUS_ENABLED }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.grafana.rule: Host(`grafana.fntz.net`)
-      traefik.http.routers.grafana.entrypoints: webSecure
-      traefik.http.routers.grafana.tls.certresolver: letsencrypt
-      traefik.http.services.grafana.loadbalancer.server.port: "3000"
-      traefik.http.routers.grafana.middlewares: tinyauth
--- a/tasks/nextcloud.yml
+++ b/tasks/nextcloud.yml
@@ -0,0 +1,54 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/nextcloud"
+    - "{{ data_dir }}/nextcloud/data"
+    - "{{ data_dir }}/nextcloud/db"
+
+- name: Create Nextcloud Docker Network
+  docker_network:
+    name: nextcloud
+
+- name: Pull latest Nextcloud Docker Image
+  docker_image:
+    name: nextcloud
+    tag: latest
+    source: pull
+
+- name: Create Nextcloud DB Docker Container
+  docker_container:
+    name: nc_postgresql
+    image: postgres:17-alpine
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: nextcloud
+    volumes:
+      - "{{ data_dir }}/nextcloud/db:/var/lib/postgresql/data"
+    env:
+      PGDATA: /var/lib/postgresql/data/pgdata
+      POSTGRES_PASSWORD: "{{ NEXTCLOUD_POSTGRES_PASSWORD }}"
+      POSTGRES_DATABASE: "{{ NEXTCLOUD_POSTGRES_DATABASE }}"
+      POSTGRES_USER: "{{ NEXTCLOUD_POSTGRES_USER }}"
+      POSTGRES_HOST: "{{ NEXTCLOUD_POSTGRES_HOST }}"
+
+- name: Create Nextcloud Docker Container
+  docker_container:
+    name: nextcloud
+    image: nextcloud
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: "{{ docker_network_name }}"
+      - name: nextcloud
+    volumes:
+      - "{{ data_dir }}/nextcloud/data:/var/www/html"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.nc.rule: Host(`{{ NEXTCLOUD_APP_URL }}`)
+      traefik.http.routers.nc.entrypoints: webSecure
+      traefik.http.routers.nc.tls.certresolver: letsencrypt
+      traefik.http.services.nc.loadbalancer.server.port: "80"
--- a/tasks/nzbget.yml
+++ b/tasks/nzbget.yml
@@ -1,25 +1,34 @@
 ---
- name: Deploy NZBGet
-  include_role:
-    name: docker
-  vars:
-    name: nzbget
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/nzbget"
-    image:
+
+- name: Pull latest NZBGet Docker Image
+  docker_image:
    name: lscr.io/linuxserver/nzbget
    tag: latest
+    source: pull
+
+- name: Create NZBGet Docker Container
+  docker_container:
+    name: nzbget
+    image: lscr.io/linuxserver/nzbget:latest
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
    volumes:
      - "{{ data_dir }}/nzbget:/config"
-      - "{{ media_path }}/Downloads:/downloads"
+      - "{{ NZBGET_DOWNLOADS_PATH }}:/downloads"
    env:
      NZBGET_USER: "{{ NZBGET_USER }}"
      NZBGET_PASS: "{{ NZBGET_PASS }}"
      TZ: "{{ TZ }}"
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
    labels:
      traefik.enable: "true"
      traefik.http.routers.nzb.rule: Host(`nzb.fntz.net`)
--- a/tasks/obsidian.yml
+++ b/tasks/obsidian.yml
@@ -0,0 +1,36 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/obsidian"
+    - "{{ data_dir }}/obsidian/data"
+    - "{{ data_dir }}/obsidian/etc"
+
+- name: Pull Docker Image
+  docker_image:
+    name: couchdb
+    tag: latest
+    source: pull
+
+- name: Create Docker Container
+  docker_container:
+    name: couchdb
+    image: couchdb:latest
+    recreate: true
+    restart_policy: unless-stopped
+    networks:
+      - name: homelab
+    volumes:
+      - "{{ data_dir }}/obsidian/data:/opt/couchdb/data"
+      - "{{ data_dir }}/obsidian/etc:/opt/couchdb/etc/local.d"
+    env:
+      COUCHDB_USER: "{{ COUCHDB_USER }}"
+      COUCHDB_PASSWORD: "{{ COUCHDB_PASSWORD }}"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.couch.rule: Host(`couch.fntz.net`)
+      traefik.http.routers.couch.entrypoints: webSecure
+      traefik.http.routers.couch.tls.certresolver: letsencrypt
+      traefik.http.services.couch.loadbalancer.server.port: "5984"
--- a/tasks/owncloud.yml
+++ b/tasks/owncloud.yml
@@ -0,0 +1,93 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/owncloud"
+    - "{{ data_dir }}/owncloud/data"
+    - "{{ data_dir }}/owncloud/db"
+    - "{{ data_dir }}/owncloud/redis"
+
+- name: Create Owncloud Docker Network
+  docker_network:
+    name: owncloud
+
+- name: Pull latest Owncloud Docker Image
+  docker_image:
+    name: owncloud/server
+    tag: "10.15"
+    source: pull
+
+- name: Create Owncloud DB Docker Container
+  docker_container:
+    name: oc_database
+    image: mariadb:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: owncloud
+    volumes:
+      - "{{ data_dir }}/owncloud/db:/var/lib/mysql"
+    env:
+      MYSQL_ROOT_PASSWORD: "{{ OWNCLOUD_DB_PASSWORD }}"
+      MYSQL_DATABASE: "owncloud"
+      MYSQL_USER: "owncloud"
+      MYSQL_PASSWORD: "{{ OWNCLOUD_DB_PASSWORD }}"
+      MARIADB_AUTO_UPGRADE: "1"
+    command: "--max-allowed-packet=128M --innodb-log-file-size=64M"
+    healthcheck:
+      test: "CMD mysqladmin ping -u root --password={{ OWNCLOUD_DB_PASSWORD }}"
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+- name: Create Owncloud Redis Container
+  docker_container:
+    name: oc_redis
+    image: redis:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: owncloud
+    command: "--databases 1"
+    healthcheck:
+      test: CMD redis-cli ping
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - "{{ data_dir }}/owncloud/redis:/data"
+
+- name: Create Owncloud Docker Container
+  docker_container:
+    name: owncloud
+    image: owncloud/server:10.15
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: "{{ docker_network_name }}"
+      - name: owncloud
+    volumes:
+      - "{{ data_dir }}/owncloud/data:/mnt/data"
+    env:
+      OWNCLOUD_DOMAIN: "{{ OWNCLOUD_APP_URL }}"
+      OWNCLOUD_TRUSTED_DOMAINS: "{{ OWNCLOUD_APP_URL }}"
+      OWNCLOUD_DB_TYPE: "mysql"
+      OWNCLOUD_DB_NAME: "owncloud"
+      OWNCLOUD_DB_USERNAME: "owncloud"
+      OWNCLOUD_DB_PASSWORD: "{{ OWNCLOUD_DB_PASSWORD }}"
+      OWNCLOUD_DB_HOST: "oc_database"
+      OWNCLOUD_ADMIN_USERNAME: "{{ OWNCLOUD_ADMIN_USERNAME }}"
+      OWNCLOUD_ADMIN_PASSWORD: "{{ OWNCLOUD_ADMIN_PASSWORD }}"
+      OWNCLOUD_MYSQL_UTF8MB4: "true"
+      OWNCLOUD_REDIS_ENBALED: "true"
+      OWNCLOUD_REDIS_HOST: "oc_redis"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.nc.rule: Host(`{{ OWNCLOUD_APP_URL }}`)
+      traefik.http.routers.nc.entrypoints: webSecure
+      traefik.http.routers.nc.tls.certresolver: letsencrypt
+      traefik.http.services.nc.loadbalancer.server.port: "8080"
+      traefik.http.middlewares.limit.buffering.maxRequestBodyBytes: "1073741824"
+      traefik.http.routers.nc.middlewares: "limit"
--- a/tasks/pelican.yml
+++ b/tasks/pelican.yml
@@ -1,32 +0,0 @@
---
- name: Deploy Pelican Panel
-  include_role:
-    name: docker
-  vars:
-    name: Pelican
-    directories:
-      - "{{ data_dir }}/pelican"
-    image:
-      name: ghcr.io/pelican-dev/panel
-      tag: latest
-    volumes:
-      - "pelican-data:/pelican-data"
-      - "pelican-logs:/var/www/html/storage/logs"
-      - "{{ data_dir }}/pelican/Caddyfile:/etc/caddy/Caddyfile"
-    etc_hosts:
-      - "host.docker.internal:host-gateway"
-    networks:
-      - name: "{{ docker_network_name }}"
-    env:
-      XDG_DATA_HOME: /pelican-data
-      TRUSTED_PROXIES: "172.21.0.0/16"
-      APP_URL: "https://{{ PELICAN_APP_URL }}"
-      ADMIN_EMAIL: "{{ PELICAN_EMAIL }}"
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.pelican.rule: Host(`panel.landite.games`)
-      traefik.http.routers.pelican.entrypoints: webSecure
-      traefik.http.routers.pelican.tls.certresolver: letsencrypt
-      traefik.http.services.pelican.loadbalancer.server.port: "80"
--- a/tasks/pihole.yml
+++ b/tasks/pihole.yml
@@ -0,0 +1,36 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/pihole"
+
+- name: Pull latest PiHole Docker Image
+  docker_image:
+    name: pihole/pihole
+    tag: latest
+    source: pull
+
+- name: Create PiHole Docker Container
+  docker_container:
+    name: pihole
+    image: pihole/pihole:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: homelab
+    published_ports:
+      - "{{ TRAEFIK_HOST_IP }}:53:53/tcp"
+      - "{{ TRAEFIK_HOST_IP }}:53:53/udp"
+    volumes:
+      - "{{ data_dir }}/pihole:/etc/pihole"
+    env:
+      FTLCONF_webserver_api_password: "{{ PIHOLE_FTLCONF_WEBSERVER_API_PASSWORD }}"
+      TZ: "{{ TZ }}"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.pihole.rule: Host(`pihole.fntz.net`)
+      traefik.http.routers.pihole.entrypoints: webSecure
+      traefik.http.routers.pihole.tls.certresolver: letsencrypt
+      traefik.http.services.pihole.loadbalancer.server.port: "80"
--- a/tasks/plausible.yml
+++ b/tasks/plausible.yml
@@ -3,6 +3,7 @@
  file:
    path: "{{ item }}"
    state: directory
+    owner: 999
  with_items:
    - "{{ data_dir }}/plausible"
    - "{{ data_dir }}/plausible/app"
--- a/tasks/plex.yml
+++ b/tasks/plex.yml
@@ -22,8 +22,8 @@
    devices:
      - /dev/dri:/dev/dri
    env:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
      TZ: "{{ TZ }}"
      VERSION: "docker"
      PLEX_CLAIM: "{{ PLEX_CLAIM_TOKEN }}"
--- a/tasks/pocketid.yml
+++ b/tasks/pocketid.yml
@@ -1,20 +1,28 @@
 ---
- name: Deploy PocketID
-  include_role:
-    name: docker
-  vars:
-    name: pocketid
-    directories:
+- name: Create Folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/pocketid"
-    image:
+
+- name: Pull latest PocketID Docker Image
+  docker_image:
    name: ghcr.io/pocket-id/pocket-id
-      tag: v2
+    tag: v1
+    source: pull
+
+- name: Create PocketID Docker Container
+  docker_container:
+    name: pocketid
+    image: ghcr.io/pocket-id/pocket-id:v1
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
    volumes:
      - "{{ data_dir }}/pocketid:/app/data"
    env:
-      ENCRYPTION_KEY: "{{ POCKETID_ENCRYPTION_KEY }}"
      APP_URL: "{{ POCKETID_APP_URL }}"
      TRUST_PROXY: "{{ POCKETID_TRUST_PROXY }}"
      PUID: "{{ PUID }}"
--- a/tasks/postgres.yml
+++ b/tasks/postgres.yml
@@ -1,21 +0,0 @@
---
- name: Deploy Postgres
-  include_role:
-    name: docker
-  vars:
-    name: postgres
-    image:
-      name: postgres
-      tag: 18-alpine
-    published_ports:
-      - "5432:5432"
-    directories:
-      - "{{ data_dir }}/postgres"
-      - "{{ data_dir }}/postgres/data"
-      - "{{ data_dir }}/postgres/import"
-    volumes:
-      - "{{ data_dir }}/postgres/data:/var/lib/postgresql/18/docker"
-      - "{{ data_dir }}/postgres/import:/mnt/import"
-    env:
-      POSTGRES_USER: "{{ POSTGRES_USER }}"
-      POSTGRES_PASSWORD: "{{ POSTGRES_PASSWORD }}"
--- a/tasks/pterodactyl.yml
+++ b/tasks/pterodactyl.yml
@@ -64,7 +64,7 @@
    restart_policy: unless-stopped
    networks:
      - name: pterodactyl
-      - name: "{{ docker_network_name }}"
+      - name: homelab
    volumes:
      - "{{ data_dir }}/pterodactyl/nginx:/etc/nginx/http.d"
      - "{{ data_dir }}/pterodactyl/logs:/app/storage/logs"
@@ -83,7 +83,7 @@
      TRUSTED_PROXIES: "*"
    labels:
      traefik.enable: "true"
-      traefik.http.routers.panel.rule: Host(`{{ PTERODACTYL_APP_URL }}`)
+      traefik.http.routers.panel.rule: Host(`panel.fntz.net`)
      traefik.http.routers.panel.entrypoints: webSecure
      traefik.http.routers.panel.tls.certresolver: letsencrypt
      traefik.http.services.panel.loadbalancer.server.port: "80"
--- a/tasks/romm.yml
+++ b/tasks/romm.yml
@@ -1,19 +1,52 @@
 ---
- name: Deploy Romm
-  include_role:
-    name: docker
-  vars:
-    name: romm
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/romm"
    - "{{ data_dir }}/romm/igdb"
    - "{{ data_dir }}/romm/assets"
    - "{{ data_dir }}/romm/config"
-    networks:
-      - name: homelab
-    image:
+    - "{{ data_dir }}/romm/db"
+
+- name: Pull latest Romm Docker Image
+  docker_image:
    name: rommapp/romm
    tag: latest
+    source: pull
+
+- name: Create Romm DB Docker Container
+  docker_container:
+    name: romm-db
+    image: mariadb:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: romm
+    volumes:
+      - "{{ data_dir }}/romm/db:/var/lib/mysql"
+    env:
+      MARIADB_ROOT_PASSWORD: romm
+      MARIADB_DATABASE: romm
+      MARIADB_USER: romm-user
+      MARIADB_PASSWORD: romm
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 30s
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+- name: Create Romm Docker Container
+  docker_container:
+    name: romm
+    image: rommapp/romm:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: homelab
+      - name: romm
    volumes:
      - "{{ data_dir }}/romm/igdb:/romm/resources"
      - "{{ data_dir }}/romm/redis:/redis-data"
@@ -21,19 +54,19 @@
      - "{{ data_dir }}/romm/config:/romm/config"
      - "{{ ROMM_LIBRARY_PATH }}:/romm/library"
    env:
-      DB_HOST: 172.16.0.44
+      DB_HOST: romm-db
      DB_NAME: romm
-      DB_USER: rommuser
+      DB_USER: romm-user
      DB_PASSWD: romm
-      ROMM_AUTH_SECRET_KEY: "{{ ROMM_AUTH_SECRET_KEY }}"
+      AUTH_SECRET_KEY: "{{ ROMM_AUTH_SECRET_KEY }}"
      IGDB_CLIENT_ID: "{{ ROMM_IGDB_CLIENT_ID }}"
      IGDB_CLIENT_SECRET: "{{ ROMM_IGDB_CLIENT_SECRET }}"
      OIDC_ENABLED: "{{ ROMM_OIDC_ENABLED }}"
      OIDC_PROVIDER: "{{ ROMM_OIDC_PROVIDER }}"
      OIDC_CLIENT_ID: "{{ ROMM_OIDC_CLIENT_ID }}"
      OIDC_CLIENT_SECRET: "{{ ROMM_OIDC_CLIENT_SECRET }}"
-      OIDC_REDIRECT_URI: "{{ ROMM_OIDC_REDIRECT_URL }}"
-      OIDC_SERVER_APPLICATION_URL: "{{ ROMM_SERVER_APPLICATION_URL }}"
+      OIDC_REDIRECT_URL: "{{ ROMM_OIDC_REDIRECT_URL }}"
+      SERVER_APPLICATION_URL: "{{ ROMM_SERVER_APPLICATION_URL }}"
    labels:
      traefik.enable: "true"
      traefik.http.routers.emu.rule: Host(`emu.fntz.net`)
--- a/tasks/runner.yml
+++ b/tasks/runner.yml
@@ -1,26 +0,0 @@
---
- name: Create Gitea Runner Configuration
-  template:
-    src: templates/gitea-runner.yaml.j2
-    dest: "{{ data_dir }}/gitea/config.yaml"
-
- name: Deploy Gitea Runner
-  include_role:
-    name: docker
-  vars:
-    name: gitea-runner
-    directories:
-      - "{{ data_dir }}/gitea"
-    image:
-      name: docker.io/gitea/act_runner
-      tag: nightly
-    network_mode: host
-    volumes:
-      - "{{ data_dir }}/gitea/config.yaml:/config.yaml"
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    env:
-      CONFIG_FILE: "/config.yaml"
-      GITEA_INSTANCE_URL: "{{ GITEA_INSTANCE_URL }}"
-      GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_REGISTRATION_TOKEN }}"
-      GITEA_RUNNER_NAME: "runner"
-      GITEA_RUNNER_LABELS: "runner:host"
--- a/tasks/scrobbling.yml
+++ b/tasks/scrobbling.yml
@@ -1,62 +0,0 @@
---
- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/scrobbling"
-    - "{{ data_dir }}/scrobbling/koito"
-    - "{{ data_dir }}/scrobbling/multi-scrobbler"
-
- name: Create Scrobbler Configuration
-  template:
-    src: templates/scrobbling/lastfm.json.j2
-    dest: "{{ data_dir }}/scrobbling/multi-scrobbler/lastfm.json"
-
- name: Deploy Kotio
-  include_role:
-    name: docker
-  vars:
-    name: scrobbling_kotio
-    network_name: scrobbling
-    networks:
-      - name: scrobbling
-      - name: homelab
-    image:
-      name: gabehf/koito
-      tag: latest
-    env:
-      KOITO_DATABASE_URL: "postgres://koito:{{ KOTIO_DB_PASS }}@172.16.0.44:5432/koito"
-      KOITO_ALLOWED_HOSTS: koito.fntz.net
-    volumes:
-      - "{{ data_dir }}/scrobbling/koito:/etc/koito"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.kotio.rule: Host(`koito.fntz.net`)
-      traefik.http.routers.kotio.entrypoints: webSecure
-      traefik.http.routers.kotio.tls.certresolver: letsencrypt
-      traefik.http.services.kotio.loadbalancer.server.port: "4110"
-
- name: Deploy Multi-Scrobbler
-  include_role:
-    name: docker
-  vars:
-    name: scrobbling_multi-scrobbler
-    image:
-      name: ghcr.io/foxxmd/multi-scrobbler
-      tag: latest
-    networks:
-      - name: scrobbling
-      - name: homelab
-    volumes:
-      - "{{ data_dir }}/scrobbling/multi-scrobbler:/config"
-    env:
-      KOITO_TOKEN: "{{ SCROBBLER_KOITO_TOKEN }}"
-      KOITO_USER: "{{ SCROBBLER_KOITO_USER }}"
-      KOITO_URL: "{{ SCROBBLER_KOITO_URL }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.scrobbler.rule: Host(`scrobbler.fntz.net`)
-      traefik.http.routers.scrobbler.entrypoints: webSecure
-      traefik.http.routers.scrobbler.tls.certresolver: letsencrypt
-      traefik.http.services.scrobbler.loadbalancer.server.port: "9078"
--- a/tasks/servarr.yml
+++ b/tasks/servarr.yml
@@ -1,26 +1,45 @@
 ---
- name: Deploy Radarr
-  include_role:
-    name: docker
-  vars:
-    name: servarr_radarr
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/servarr"
    - "{{ data_dir }}/servarr/sonarr_config"
    - "{{ data_dir }}/servarr/radarr_config"
    - "{{ data_dir }}/servarr/lidarr_config"
-    image:
+
+- name: Pull latest Radarr Docker Image
+  docker_image:
    name: lscr.io/linuxserver/radarr
    tag: latest
+    source: pull
+- name: Pull latest Sonarr Docker Image
+  docker_image:
+    name: lscr.io/linuxserver/sonarr
+    tag: latest
+    source: pull
+- name: Pull latest Lidarr Docker Image
+  docker_image:
+    name: lscr.io/linuxserver/lidarr
+    tag: latest
+    source: pull
+
+- name: Deploy Radarr Container
+  docker_container:
+    name: radarr
+    image: lscr.io/linuxserver/radarr:latest
+    restart_policy: unless-stopped
+    recreate: true
    volumes:
      - "{{ data_dir }}/servarr/radarr_config:/config"
-      - "{{ media_path }}:/media"
-      - "{{ media_path }}/Downloads:/downloads"
+      - "{{ SERVARR_MEDIA_PATH }}:/media"
+      - "{{ NZBGET_DOWNLOADS_PATH }}:/downloads"
    networks:
      - name: homelab
    env:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
      TZ: "{{ TZ }}"
    labels:
      traefik.enable: "true"
@@ -29,21 +48,19 @@
      traefik.http.routers.radarr.tls.certresolver: letsencrypt
      traefik.http.services.radarr.loadbalancer.server.port: "7878"

- name: Deploy Sonarr
-  include_role:
-    name: docker
-  vars:
-    name: servarr_sonarr
-    image:
-      name: lscr.io/linuxserver/sonarr
-      tag: latest
+- name: Deploy Sonarr Container
+  docker_container:
+    name: sonarr
+    image: lscr.io/linuxserver/sonarr:latest
+    restart_policy: unless-stopped
+    recreate: true
    volumes:
      - "{{ data_dir }}/servarr/sonarr_config:/config"
-      - "{{ media_path }}:/data"
-      - "{{ media_path }}/Downloads:/downloads"
+      - "{{ SERVARR_MEDIA_PATH }}:/data"
+      - "{{ NZBGET_DOWNLOADS_PATH }}:/downloads"
    env:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
      TZ: "{{ TZ }}"
    networks:
      - name: homelab
@@ -53,3 +70,26 @@
      traefik.http.routers.sonarr.entrypoints: webSecure
      traefik.http.routers.sonarr.tls.certresolver: letsencrypt
      traefik.http.services.sonarr.loadbalancer.server.port: "8989"
+
+- name: Deploy Lidarr Container
+  docker_container:
+    name: lidarr
+    image: lscr.io/linuxserver/lidarr:latest
+    restart_policy: unless-stopped
+    recreate: true
+    env:
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
+      TZ: "{{ TZ }}"
+    volumes:
+      - "{{ data_dir }}/servarr/lidarr_config:/config"
+      - "{{ SERVARR_MEDIA_PATH }}:/media"
+      - "{{ NZBGET_DOWNLOADS_PATH }}:/downloads"
+    networks:
+      - name: homelab
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.lidarr.rule: Host(`lidarr.fntz.net`)
+      traefik.http.routers.lidarr.entrypoints: webSecure
+      traefik.http.routers.lidarr.tls.certresolver: letsencrypt
+      traefik.http.services.lidarr.loadbalancer.server.port: "8686"
--- a/tasks/storage-api.yml
+++ b/tasks/storage-api.yml
@@ -1,20 +1,34 @@
 ---
- name: Deploy Storage API
-  include_role:
-    name: docker
-  vars:
-    name: storage-api
-    directories:
+- name: "Create file structure"
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/storage-api"
    - "{{ data_dir }}/storage-api/app"
    - "{{ data_dir }}/storage-api/files"
-    image:
-      name: storage-api
-      tag: latest
-    build:
+
+- name: "Clone latest Storage API"
  git:
    repo: git@git.alexav.gg:alex/storage-api.git
    dest: "{{ data_dir }}/storage-api/app"
+
+- name: "Build Storage API Docker Image"
+  docker_image:
+    name: storage-api
+    tag: "latest"
+    build:
+      path: "{{ data_dir }}/storage-api/app"
+      dockerfile: Dockerfile
+    source: build
+    state: present
+
+- name: Deploy Storage API Container
+  docker_container:
+    name: storage_api
+    image: storage-api:latest
+    recreate: true
+    restart_policy: unless-stopped
    networks:
      - name: "{{ docker_network_name }}"
    volumes:
--- a/tasks/tautulli.yml
+++ b/tasks/tautulli.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Tautulli
-  include_role:
-    name: docker
-  vars:
-    name: tautulli
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/tautulli"
-    image:
+
+- name: Pull latest Tautulli Docker Image
+  docker_image:
    name: ghcr.io/tautulli/tautulli
    tag: latest
+    source: pull
+
+- name: Create Tautulli Docker Container
+  docker_container:
+    name: tautulli
+    image: ghcr.io/tautulli/tautulli
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/termix.yml
+++ b/tasks/termix.yml
@@ -0,0 +1,32 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/termix"
+
+- name: Pull latest Termix Docker Image
+  docker_image:
+    name: ghcr.io/lukegus/termix
+    tag: latest
+    source: pull
+
+- name: Create Termix Docker Container
+  docker_container:
+    name: termix
+    image: ghcr.io/lukegus/termix:latest
+    restart_policy: unless-stopped
+    recreate: true
+    networks:
+      - name: homelab
+    volumes:
+      - "{{ data_dir }}/termix:/app/data"
+    env:
+      PORT: "8080"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.termix.rule: Host(`ssh.fntz.net`)
+      traefik.http.routers.termix.entrypoints: webSecure
+      traefik.http.routers.termix.tls.certresolver: letsencrypt
+      traefik.http.services.termix.loadbalancer.server.port: "8080"
--- a/tasks/tinyauth.yml
+++ b/tasks/tinyauth.yml
@@ -1,16 +1,18 @@
 ---
- name: Deploy Tinyauth
-  include_role:
-    name: docker
-  vars:
-    name: tinyauth
-    image:
+- name: Pull latest Tinyauth Docker Image
+  docker_image:
    name: ghcr.io/steveiliop56/tinyauth
    tag: v4
+    source: pull
+
+- name: Create Tinyauth Docker Container
+  docker_container:
+    name: tinyauth
+    image: ghcr.io/steveiliop56/tinyauth:v4
+    restart_policy: unless-stopped
+    recreate: true
    networks:
-      - name: "{{ docker_network_name }}"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
+      - name: homelab
    env:
      USERS: "{{ TINYAUTH_USERS }}"
      SECRET: "{{ TINYAUTH_SECRET }}"
@@ -26,9 +28,11 @@
      OAUTH_WHITELIST: "{{ TINYAUTH_OAUTH_WHITELIST }}"
      APP_TITLE: "{{ TINYAUTH_APP_TITLE }}"
      BACKGROUND_IMAGE: "{{ TINYAUTH_BACKGROUND_IMAGE }}"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
    labels:
      traefik.enable: "true"
-      traefik.http.routers.tinyauth.rule: Host(`{{ TINYAUTH_HOSTNAME }}`)
+      traefik.http.routers.tinyauth.rule: Host(`auth.fntz.net`)
      traefik.http.routers.tinyauth.entrypoints: webSecure
      traefik.http.routers.tinyauth.tls.certresolver: letsencrypt
      traefik.http.middlewares.tinyauth.forwardauth.address: http://tinyauth:3000/api/auth/traefik
--- a/tasks/uptime-kuma.yml
+++ b/tasks/uptime-kuma.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Uptime Kuma
-  include_role:
-    name: docker
-  vars:
-    name: uptime-kuma
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/uptime-kuma"
-    image:
+
+- name: Pull latest Uptime Kuma Docker Image
+  docker_image:
    name: louislam/uptime-kuma
    tag: latest
+    source: pull
+
+- name: Create Uptime Kuma Docker Container
+  docker_container:
+    name: uptime-kuma
+    image: louislam/uptime-kuma
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/vaultwarden.yml
+++ b/tasks/vaultwarden.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Vaultwarden
-  include_role:
-    name: docker
-  vars:
-    name: vaultwarden
-    directories:
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
    - "{{ data_dir }}/vaultwarden"
-    image:
+
+- name: Pull latest Vaultwarden Docker Image
+  docker_image:
    name: vaultwarden/server
    tag: latest
+    source: pull
+
+- name: Create Vaultwarden Docker Container
+  docker_container:
+    name: vaultwarden
+    image: vaultwarden/server:latest
+    restart_policy: unless-stopped
+    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/templates/monitoring/loki.yaml.j2
+++ b/templates/monitoring/loki.yaml.j2
@@ -1,29 +0,0 @@
-auth_enabled: false
-
-server:
-  http_listen_port: 3100
-
-common:
-  path_prefix: /loki
-  storage:
-    filesystem:
-      chunks_directory: /loki/chunks
-      rules_directory: /loki/rules
-  replication_factor: 1
-  ring:
-    kvstore:
-      store: inmemory
-
-schema_config:
-  configs:
-    - from: 2020-10-24
-      store: tsdb
-      object_store: filesystem
-      schema: v13
-      index:
-        prefix: index_
-        period: 24h
-
-storage_config:
-  filesystem:
-    directory: /loki/chunks
--- a/templates/monitoring/prometheus.yml.j2
+++ b/templates/monitoring/prometheus.yml.j2
@@ -1,14 +0,0 @@
-global:
-  scrape_interval: 15s
-  evaluation_interval: 15s
-
-scrape_configs:
-  - job_name: "prometheus"
-    static_configs:
-      - targets: ["monitoring_prometheus:9090"]
-  - job_name: "node-exporter"
-    static_configs:
-      - targets: ["172.16.0.44:9100"]
-  - job_name: "cadvisor"
-    static_configs:
-      - targets: ["monitoring_cadvisor:8080"]
--- a/templates/monitoring/promtail.yaml.j2
+++ b/templates/monitoring/promtail.yaml.j2
@@ -1,63 +0,0 @@
-server:
-  http_listen_port: 9080
-
-positions:
-  filename: /tmp/positions.yaml
-
-clients:
-  - url: http://monitoring_loki:3100/loki/api/v1/push
-
-scrape_configs:
-  - job_name: docker
-    docker_sd_configs:
-      - host: unix:///var/run/docker.sock
-        refresh_interval: 5s
-    relabel_configs:
-      # Keep only running containers
-      - source_labels: ['__meta_docker_container_id']
-        target_label: container_id
-
-      # Container name (strips leading slash)
-      - source_labels: ['__meta_docker_container_name']
-        regex: '/(.+)'
-        target_label: container_name
-
-      # Compose project name
-      - source_labels: ['__meta_docker_container_label_com_docker_compose_project']
-        target_label: compose_project
-
-      # Compose service name
-      - source_labels: ['__meta_docker_container_label_com_docker_compose_service']
-        target_label: compose_service
-
-      # Image name
-      - source_labels: ['__meta_docker_container_image']
-        target_label: image
-
-      # Custom labels - grab any label starting with "logging."
-      # e.g. logging.env=production becomes env=production
-      - regex: '__meta_docker_container_label_logging_(.+)'
-        action: labelmap
-        replacement: '$1'
-
-      # Drop containers with logging=disabled label
-      - source_labels: ['__meta_docker_container_label_logging']
-        regex: 'disabled'
-        action: drop
-
-    pipeline_stages:
-      # Docker JSON log format parsing
-      - json:
-          expressions:
-            output: log
-            stream: stream
-            timestamp: time
-
-      # Use Docker's timestamp
-      - timestamp:
-          source: timestamp
-          format: RFC3339Nano
-
-      # Output just the log line
-      - output:
-          source: output
--- a/templates/runner/gitea-runner.yaml.j2
+++ b/templates/runner/gitea-runner.yaml.j2
@@ -1,23 +0,0 @@
-log:
-  level: info
-
-runner:
-  file: .runner
-  capacity: 1
-  timeout: 3h
-  shutdown_timeout: 0s
-  insecure: false
-  fetch_timeout: 5s
-  fetch_interval: 2s
-  labels:
-    - "ubuntu-latest:docker://catthehacker/ubuntu:act-latest"
-    - "ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04"
-    - "ansible:docker://git.alexav.gg/alex/setup-ansible:latest"
-
-container:
-  network: "host"
-  privileged: true
-  force_pull: true
-  force_rebuild: false
-  require_docker: false
-  docker_timeout: 0s
--- a/templates/scrobbling/lastfm.json.j2
+++ b/templates/scrobbling/lastfm.json.j2
@@ -1,12 +0,0 @@
-[
-  {
-    "name": "lastFm",
-    "enable": true,
-    "configureAs": "source",
-    "data": {
-      "apiKey": "{{ SCROBBLER_LASTFM_TOKEN }}",
-      "secret": "{{ SCROBBLER_LASTFM_SECRET }}",
-      "redirectUri": "https://scrobbler.fntz.net/lastfm/callback"
-    }
-  }
-]