diff --git a/group_vars/all/ansible.yml b/group_vars/all/ansible.yml
index 2925bad..075ca96 100644
--- a/group_vars/all/ansible.yml
+++ b/group_vars/all/ansible.yml
@@ -1 +1,5 @@
+# Use python 3
+ansible_python_interpreter: /usr/bin/python3
+
+# Set your become password with `keyring set ansible-painsperdus become`
 ansible_become_password: "{{lookup('community.general.keyring','ansible-painsperdus become')}}"
diff --git a/group_vars/all/totp.yml b/group_vars/all/totp.yml
deleted file mode 100644
index b171f71..0000000
--- a/group_vars/all/totp.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-totp_periode: 60
-totp_digits: 6
-totp_machine: "pains-perdus"
diff --git a/group_vars/all/user_vault b/group_vars/all/user_vault
deleted file mode 100644
index 5cf060c..0000000
--- a/group_vars/all/user_vault
+++ /dev/null
@@ -1,162 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35633963343765633636396266393332366432646631306564643361343531383734646235663931
-6139666164356533326430636133363961316239386163640a346635393435333437623034343638
-34656166323733656539326133663661616437653065623061396434313663626265326466363464
-3666383465663962330a613766393463303136316563396134663462626661366363303666656462
-39643161323235303462326437393233636538336331333031363933666466306633303639643163
-62396439663465323037373161393638643566383834663666656333653830333530653430383465
-62323536666531383136666537326666323235363062396566616565316232393733613338653864
-33633665363431616338363264366531313064306138656537616438656632386332386435363037
-31663934366331396239366137353161316565323036623231393839613265366537646234663339
-31353139616639393039653338383261356636653164636631363363633866393761643336323563
-35323063323031333862383765613238363863326231346537633066323235383531633934306565
-38333765613965633163383235333834663164353034656362323332303431633062386466636266
-37386163303331303935373565646232366233326436633664613464376262343433646331353732
-31316163343064336539623637323135623266656566353934623431353062653236323063306237
-62353132666536313862363064396261346430656637613561373935383364363836643066313166
-35626465396238626332386132346334366635616662353339636636663931333663376266306465
-66383330303939366161383961326635663830623464643436653638343162346331313133373661
-39656331623135623461333262353965303832626335613363333634363237346232633336306430
-30613639653961373730653035643534643236333033386636366462316532383966656635623130
-38323163666166346262656361306362326463356661303237613362346436326263333735313663
-66613932396337616231393566613338633337653036373938323864626133626237333235666537
-39646365316335343538336634386464326435323336373136653766616461663761633764633637
-38663063613831636136343864333663303861383264323836633239323638613064303933656334
-64636339323066336561333739616362613238373432356639386135663862363162316366393137
-34656431663833613532613966373137326631633437383537326566376166386665346261383933
-30323134333936393237666363313466653630633734303437313237326135353631363462353731
-37656565313537306663663365346665326136626663343162633661376565653830383632366263
-34323337616565313265343031386339633661653164616136313261616339336433313466643065
-64303531343838393862303230363339353332376163313066353935656531343463646435333164
-62316238303866326330623232316539653535343966326532653539653864326636626434656634
-61313164626366386234343435366162643933323434323031373365383766383962616434303732
-38626562343863313862643134303430613833653466396331323361393163343865653661666230
-63323434613139393637613262303135623961626531623934613933643836663633326638646432
-31393161386262363830386464613461623836373933343566383139653532326634313166653732
-37363433333534633336333730313861623737376233663866666331333937313462336430616439
-66383632626663363930386165386562623166313064366263343739623030666233616664633163
-39663739646166646537663865303635623636303466353932373531336339396239306631656132
-39636663353036613432653833363732313263386562636666613430303463383139636335336164
-62656166383863326365383934373863653061366135343934313163303764363434373134633934
-32363535303034666630643935373538376339643364383765343738616333356431366534313636
-30356539323035633834323966313039333233613861373561613564636435313430313064386234
-31646363646332376664663562363436363565356362323638626330633935393531353831386136
-62396530613337333563383064333037303064393130383062303739383465646132393263633233
-30643863623939663063366534643362316163373934656633656438656634373266313561646435
-61303164306465336230346535653935663030336466623565373565653537626162313562343834
-37623464376562316663616337633838633332373165366639343962396239666564613631383237
-62353536613635356531356265313166306339356634343361313063613836313432373231663961
-33333732643262663131373662626663336433343131333163666333616265663662316339336234
-61643830656566373533373132643663336333333436663735333337633532313365306338646132
-38396664306133336533626366303764656235313233613965363738616433653434646633363064
-38616234396634643666613133653066363661613939316633316137336162356434303233353161
-62643430656237336133316666663664336637323638396634623765326637306234313732376436
-32326430336434646366336562646361363935343535376564333637343930626139343630323538
-38656564373764363037653132393263386339383331316162366266303532306462643534663166
-66353566376435306263353431343662623365323033393535363762353630633133316562303733
-39323735663663326331333530393863653564623330373437323762396565626439396438323965
-33356536656634396337353239343962393335636661313334353065313839356632666266383564
-36366435356362326163626339323130346139326363383062613138383062333530633430376565
-30383361306337343661643763336361383335633463333838643762393564393962646630613230
-32363735386336666435356335666336633834333966633238373033326539666333343034393239
-39376433633139646331376139663238363734346235366230383836323264356133653634313035
-62383165313936363366663037353163643662376164306530613930623239313631616663393635
-63623935656237653838633235653565326235643635663766326531396637613732626338393965
-33333135323439386561393461663237333431623065376361373134383534633264373939343262
-37313663656661646137646132656434333333383664613261326133666430636632306134323136
-65386137613932656461373430373866643831623132323165353735373035356536353661373164
-66313632663533333038643265353534393133303234643534363762663436393766393961633764
-37623561363063646165343431353366613335336130383264333734343039393434396436663239
-64346261666134613432646231623235306463306133656434343261363331636461663538396264
-36363264376339393331633162376638316566363534393164636539646537353135633131363864
-35336232343231363662623764396439306331373730396462616434633931343161303731366561
-31666433353737303035613061393462633462623830356439623664646265323336623536656236
-31386434653533636235623236623239633761626531376261626430636137363662373864643533
-63306438376264383064636665663631616635643565616230313836613964333364366361363336
-66326562393261663537386366613130323065663465616134633666386435626333663962383036
-36353231333639653737303963366231643338316537386133643264656535666631306637353734
-65613239666135303931336338393639636634323361303037383161326664346535623261376635
-66376163393237623266323731333231373037383934623962653231613265663834663766613731
-64643165666462303038323364383063323135393864626433323733333431343931393634363463
-35346636663434646662353935323062653337316631396261386238346535356530373231343732
-37383261663630663435333463616163663364653964306666363462343236373135303237393039
-34646331366237336366643235386233366363643065313639303463366535316464653266643231
-39336164323035303963323038666437396336313438373334326163356135663432366432356662
-39353530303136623633363764303737313530653461623531326332336166663362393230623963
-38313661393262313531306364643864333037386132306263393965646630343132323236383734
-62363239363734303561306166613436653361646630383065353335323861663533613433643366
-35376334396539353265373531353134386638343730383461656537653538623338353264653236
-63363231396630313365303165323034336564633032316636323137313238336231636536306237
-62343431363036323965326639346533343339313962666234356466376638333866623430333939
-32343335613436383864643330363165653634346637393430623462303163643164656535393065
-62316231666666356336366265333636386265613462313932353437613262323337656334613932
-30373738303035366263306239393339373761633630663366303838393261323235363037623763
-31383461396663363137353163363430313135346239363664653662633166636537343861363130
-62653735626566323832313362623163663632356338643834396233613463386330623036306138
-66633366303964646564663962343937363331616235323239376638323730643666333935336639
-36383462633731346539373666623937666533613534616663663939613938343365383564643464
-33616266653165626564663732343232666237336134303566663932346138306265303231616632
-37383938663366613363656335356663323737366432613431366139646662343230643066663233
-32663236386665326562386130623039303531383835343865623761646166313039333438303537
-63366361363637633934333138653934633438623738386337613639343534313237346261376466
-38396639623732626163343139633438666232316332323662633332336135666234643362356238
-37333136313061366432353237633234316236616132666632333235623737303166393463663336
-65333736313931313565393863376461356463306532636164306136336561643563356335643065
-36663061626664653166623637663865373136666461306363643337663965666535303765396234
-33383935363335306461313138343163653536623633366462653730326135323033313663636439
-30636464376632343536316664356330346232636337343766653236666536323137343537346564
-66393864316136383730656263386637323166613966333738303537613761383236303330633064
-63336238653431666633393937666161663037616462343365343665383736326439376638356638
-37663332306235653164626432393738393637373538336332653361653130393361636638646162
-31393666653963666234376663313534346434343261336431323137666563303461616135373135
-38376236336162633630336433653834343864366236343338363632373038643163663665633537
-64363162313861313239333733323836353930316139663239333933383030646434333661333938
-36626566373161316638326632656365353966626662663138366264313765393264303936623161
-63313765323065626635633134313765613366386262646631356563663132313665326632346535
-38636235633861386535313937363663363165363530396166636362343962313735663731316362
-31653862376264616535336363333965656531336565623237316232636664666635366137313866
-34393438363534386632323364363536393264643962363235353264373662393362633362613835
-31376139353562626563653966346237613539326234663434626333643132303832363161326362
-35306132386134616336663037626566616132616264666465313765376234306266616262326538
-65363661306233323833343737313135366664643439666631313565373436663435333462376132
-66633265616638646136626133393937626531333136663566343336306134306137633835376162
-66613836383965633864643735393432316663633635343732313338633239636237656563613565
-30623730333662353639353363653936396563303334313938346438633938346464333963323261
-62666232663730653864623566313138633837316265363463666438326634313738303362396330
-62643639663930373939656566646663363432376636623264336530353635383033313965393661
-62633534376335363537356131636530636365373764653065363362356362326566643664666439
-66303338373061373366623632396162633034323632353933356663396136323834663862313365
-32616263613637353436643032363134396332333730336633333164653737376238656434343864
-63363937316430323965393839336362303065373738343537353238643638336236393637666434
-34363638366536303762656164303037613162636462623336633166353435363264646436623233
-37376335616462306439396239363630633730313265656631623162363039373564653337326537
-63376236623062663730373633343863313530353731636430613863343862376135613332306430
-32623063306534373864313535623166303462336136356237653538643964643262623930393035
-39643639383833343930313163663733616334666132323432326466613137653735376163373238
-35623139303364336337373331666535303563643831643732383363336235373134366564623030
-37663738373839643636633937613632323264373435656465316364633665326165343964646137
-39343062333863633634636334613036613939346334363936353464636433353162316662663864
-63306361373864653464306438646665393131333131643637386436306264303237336136306138
-65613163333661353839666231313366343335386131306431643336343830386336346663363464
-61353731626463633937613935303036616365363630366631386363613565306562366339636463
-65323563313265656466303531396338343636303131396463663535346362333866353266356333
-30313066313136626363386662653037323962373434626461666563663737646463366265333339
-37623232356638333135303831626139336362303363333831353361653866643833313039363731
-38336535653536333266626235346132366232623331623962303730663839666430393365333361
-61373966326537613765343666663533623566643466353438666163623161366136643138613035
-31336339346166376666316666383533376235333066333138353833643762313161353435363435
-63303733616437326361316436663666363362336636653931343238636637396330343339376638
-36626464616139666435343161333562623063336264383632646361396338366465353739343961
-63303463366530303831336535313230363932313462633732663337363835336331386537323363
-35353866656233336338613965616530363233643134343334373335346139396130353631653462
-39346663633739663162336462373263353662353638356265323363303039306238376666643931
-62383234343936323133646464656435313137643135303232316235356233656264316232336635
-34663930613263613261623831393431656231393365366661356338323932373365306265313062
-61333031646336636566323834616139306166333637613235326661343332633763323032386534
-65613663396261646631643363313365616333393339376136306536643864396531386332616532
-62636135643865613130396230363866313662346338323934663662343835616635343266616339
-38663466333561393038356261376237373337353435363464616538626263366631323439643138
-65363562353063613064633666363763356666313933386262333963386363656465666462303037
-34313964663738653038376438313339386439643736366634646638623338333965333831326631
-66616132336235366563633064323538363964663563333330323339333166316435376466613761
-38636462666663343737633633626530656230336234323763613735336232383066
diff --git a/group_vars/all/users.example b/group_vars/all/users.example
index 1d91425..e12f5ca 100644
--- a/group_vars/all/users.example
+++ b/group_vars/all/users.example
@@ -6,4 +6,3 @@ user_dict:
       ssh_keys: 
         - "ssh-rsa azrekgnbmoienbzrinoien...aoeuzn lorem@host1",
         - "ssh-ed25519 azrekgnbmoienbzrinoien...aoeuzn lorem@host2",
-      totp: "daeae8ce486f6636d68c37c21ce002" # the hex value
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 90d7b95..cfe8aed 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -1,6 +1,4 @@
 ---
-# Use python 3
-ansible_python_interpreter: /usr/bin/python3
 dns_resolve_server: 1.1.1.1
 
 # Default prometheus serveur, to overide in host_vars or something
diff --git a/group_vars/all/vpn_vault b/group_vars/all/vpn_vault
deleted file mode 100644
index f81f8e5..0000000
--- a/group_vars/all/vpn_vault
+++ /dev/null
@@ -1,36 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33326464643530643862323238303631356639303466646138663239643165633333316539383033
-3735666534333264303135656539666266343237366232360a363765343864326139343237323634
-33366361656236336463666563376666346666353563373236653964633632383733303030383632
-3339366333363063660a643036336663396631346335343838306237663034383436383631626161
-36383562333664626366613331623765343631323833303935633737366333366461313136643862
-64363362663933313234323435393031353137393035666565373030623936316564316565663938
-30343537366138303737633233663433643335353335653963653066363632643339376566363730
-61383833373634336237373733633961373633386434663333333935653831393631336165393265
-66373561363635663062316435303663306436343133303630373363363363386338643666326338
-37313530346434376539663063656236643339313939623737623937333037366535303963363638
-39613534383265353235313662393533616138616439333835663662623435303538633763356437
-35643736643134643133346132616234326664353831613237636561616663656133633935333661
-32363436306535616366393865643534636133366565393136313134303333363733333265656431
-34353166393737343565396566343239303030343335663639653934363632643862353962303730
-62353661316364646232313964343033393364613737353335393466316466316466363334326532
-32306263326134373337646137326262626632333937373039373030313063326161656436633737
-62663761346436383330383731626135616439383136626661323830633964346130643634326461
-34633562323538653736333435346665623565643639636565353166353336363737333064343337
-66626639386663383162643362396634623237346361623033336637366339353134356537333462
-37313233643531666332316666386434376235643764356237653935353335323965366237303965
-64616532656461363666373235353539363338623031626233386435393334653163636337366130
-37343834343433353632393963663330623736643833356466363663653332626530623962343266
-36376366666164666433653462653635303233626330653734313538646330316339383339643362
-65623564616638393638663031663233356430343139653261386262356433336637613737306233
-65316630613137633632393033396366633134653864663036646436653161343965373461643366
-63663635623563373164633266373931303338373938633265636536613164636339383936383935
-38303636323836626538663165383533353838373233303237333763616430656537656632373366
-35616361303061646235306562633761373034346661626330626237613337333833643363653031
-37653964643133303666363666343839613663643634663537326538303035646564626433643565
-36343763613237313333393763376133316439636239626533386131396530366162313566303832
-39646237346463636239613062313566623636653830353130383866383632616365386139663531
-37656634373135373530393733386539646532633635646232323439373433366537313937636439
-31313836636133663033626239346230303361666136626637646261373838333638613061383065
-63333639326261663631363734376236316534376231353336656230613534313930366330626630
-666466326463316330373334353563373262
diff --git a/group_vars/all/vpn_vault.example b/group_vars/all/vpn_vault.example
deleted file mode 100644
index 303cf10..0000000
--- a/group_vars/all/vpn_vault.example
+++ /dev/null
@@ -1,4 +0,0 @@
----
-vpn_vault_hindley_key: "AAAAAcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw="
-vpn_vault_azerty_key: "BBBBBcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw="
-vpn_vault_hellman_key: "CCCCCcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw="
diff --git a/group_vars/all/vpn.yml b/group_vars/vpn/main.yml
similarity index 100%
rename from group_vars/all/vpn.yml
rename to group_vars/vpn/main.yml
diff --git a/host_vars/barium/ansible.yml b/host_vars/barium/ansible.yml
deleted file mode 100644
index e49c9c0..0000000
--- a/host_vars/barium/ansible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_host: "barium.lan"
diff --git a/host_vars/barium/main.yml b/host_vars/barium/main.yml
new file mode 100644
index 0000000..bf7c4d2
--- /dev/null
+++ b/host_vars/barium/main.yml
@@ -0,0 +1,6 @@
+---
+ansible_host: "barium.lan"
+
+## Users
+users:
+  - g33kex: sudo
diff --git a/host_vars/barium/users.yml b/host_vars/barium/users.yml
deleted file mode 100644
index e5c5450..0000000
--- a/host_vars/barium/users.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-users:
-  - g33kex: sudo
diff --git a/host_vars/bismuth/ansible.yml b/host_vars/bismuth/ansible.yml
deleted file mode 100644
index ce56910..0000000
--- a/host_vars/bismuth/ansible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_host: "bismuth.lan"
diff --git a/host_vars/bismuth/users.yml b/host_vars/bismuth/main.yml
similarity index 54%
rename from host_vars/bismuth/users.yml
rename to host_vars/bismuth/main.yml
index c5f2a60..bdabb89 100644
--- a/host_vars/bismuth/users.yml
+++ b/host_vars/bismuth/main.yml
@@ -1,4 +1,7 @@
 ---
+ansible_host: "bismuth.lan"
+
+## Users
 users:
   - g33kex: sudo
   - antoine: sudo
diff --git a/host_vars/hindley/ansible.yml b/host_vars/hindley/ansible.yml
deleted file mode 100644
index 287daec..0000000
--- a/host_vars/hindley/ansible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_host: "hindley.adh.auro.re"
diff --git a/host_vars/hindley/apt_proxy.yml b/host_vars/hindley/apt_proxy.yml
deleted file mode 100644
index 583f7f8..0000000
--- a/host_vars/hindley/apt_proxy.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-proxy_apt_interfaces:
-  - "{{ interfaces['wg0'].ipv4 }}"
diff --git a/host_vars/hindley/vpn.yml b/host_vars/hindley/main.yml
similarity index 64%
rename from host_vars/hindley/vpn.yml
rename to host_vars/hindley/main.yml
index ead66d1..841ce7e 100644
--- a/host_vars/hindley/vpn.yml
+++ b/host_vars/hindley/main.yml
@@ -1,8 +1,33 @@
 ---
+ansible_host: "hindley.adh.auro.re"
+
+## Users
+users:
+  - histausse: sudo
+  - g33kex: sudo
+  - thomyrock: sudo
+  - dorian: sudo
+
+## Networking
+interfaces:
+  enp2s0:
+    ipv4: 45.66.110.3
+    type: dhcp
+  wg0:
+    ipv4: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}"
+    netmaskv4: "{{ intranet.netmaskv4 }}"
+    type: wireguard
+
+ipv4_forwarding: true
+ipv6_forwarding: false
+
+lan_address: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}"
+
+## VPN
 vpn_interfaces:
   wg0:
     ip: "{{ interfaces.wg0.ipv4 }}"
-    private_key: "{{ vpn_vault_hindley_key }}"
+    private_key: "{{ vpn_key }}"
     public_key: "Ce48/ZdvpI2S82bIivhiWHQsyidzTAtxCnEYojY3xEA="
     keepalive: false
     peers:
@@ -23,5 +48,6 @@ vpn_interfaces:
         - "{{ hostvars['matrix_server'].vpn_interfaces.wg0.ip }}/32"
       comment: "matrix VM, hosted on g33kex's server"
 
-
-
+# apt proxy
+proxy_apt_interfaces:
+  - "{{ interfaces['wg0'].ipv4 }}"
diff --git a/host_vars/hindley/networking.yml b/host_vars/hindley/networking.yml
deleted file mode 100644
index efdd3e5..0000000
--- a/host_vars/hindley/networking.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-interfaces:
-  enp2s0:
-    ipv4: 45.66.110.3
-    type: dhcp
-  wg0:
-    ipv4: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}"
-    netmaskv4: "{{ intranet.netmaskv4 }}"
-    type: wireguard
-
-ipv4_forwarding: true
-ipv6_forwarding: false
-
-lan_address: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}"
diff --git a/host_vars/hindley/secrets.yml b/host_vars/hindley/secrets.yml
new file mode 100644
index 0000000..caedca2
--- /dev/null
+++ b/host_vars/hindley/secrets.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+33616139646133343635303262363364376264323635656530643766393139666165316561656666
+3963643939633835396136343761363839376562326162610a343365303635373761616137663231
+31326666303231366433343266616264313535333965666266396639633465626336653363343066
+6239353034383537630a313136323163313436646434646638316535313364653936373662326263
+32353363366632636537613134646639653833326462346137613661653832663035336234613638
+37373734663564346135643930613064666639333532306633363532306662633063386538343438
+33623439383037633235623762373437613665333537363664333235653466643536353030336337
+62306233636461326463
diff --git a/host_vars/hindley/users.yml b/host_vars/hindley/users.yml
deleted file mode 100644
index 89d2310..0000000
--- a/host_vars/hindley/users.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-users:
-  - histausse: sudo
-  - g33kex: sudo
-  - thomyrock: sudo
-  - dorian: sudo
diff --git a/host_vars/krypton/ansible.yml b/host_vars/krypton/ansible.yml
deleted file mode 100644
index f2b6a0a..0000000
--- a/host_vars/krypton/ansible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_host: "krypton.lan"
diff --git a/host_vars/krypton/main.yml b/host_vars/krypton/main.yml
new file mode 100644
index 0000000..5c05669
--- /dev/null
+++ b/host_vars/krypton/main.yml
@@ -0,0 +1,6 @@
+---
+ansible_host: "krypton.lan"
+
+## Users
+users:
+  - g33kex: sudo
diff --git a/host_vars/krypton/users.yml b/host_vars/krypton/users.yml
deleted file mode 100644
index e5c5450..0000000
--- a/host_vars/krypton/users.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-users:
-  - g33kex: sudo
diff --git a/host_vars/technetium/secrets.yml b/host_vars/technetium/secrets.yml
index bbe3d86..ab94825 100644
--- a/host_vars/technetium/secrets.yml
+++ b/host_vars/technetium/secrets.yml
@@ -1,8 +1,9 @@
 $ANSIBLE_VAULT;1.1;AES256
-66656663643539653865323364386464393932303834303832313463636662643161396533656534
-3330346432353736323266653063303538306232356133650a373134623933666137636538343832
-65323430353263623234616336396530613038333530333433383966653739336439643431363065
-6363313939623162340a626635633335333631306332386535393861653462383765376464613230
-63313033613462393331313431616138306430316634373334656537323431336633663833636132
-33323365316533373462323361383561623535326336643232633631316438316362653166616462
-333165626564653538333033393233303435
+62353537323135663839356464396361646432303638653765616663363432613266383739343835
+6435313938393332396537613031316333643835666164650a396464396632353031303662386332
+65643437616137383837623566316438376334363634653061383334356530366261343865323631
+3466653030623239390a363765386362323563333861353964343161613732626565633666343430
+61353266623033643030346238303562313864653161623436666463363761336532346137656138
+38316439663361363930656162633232396237343165396463626633633837346335643038653131
+36323039663333346131303735316539333335383565623061646634613861303630356563633238
+63393034323136663861
diff --git a/host_vars/vanadium/ansible.yml b/host_vars/vanadium/ansible.yml
deleted file mode 100644
index 221d731..0000000
--- a/host_vars/vanadium/ansible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_host: "vanadium.lan"
diff --git a/host_vars/vanadium/main.yml b/host_vars/vanadium/main.yml
new file mode 100644
index 0000000..9937ea3
--- /dev/null
+++ b/host_vars/vanadium/main.yml
@@ -0,0 +1,6 @@
+---
+ansible_host: "vanadium.lan"
+
+## Users
+users:
+  - g33kex: sudo
diff --git a/host_vars/vanadium/users.yml b/host_vars/vanadium/users.yml
deleted file mode 100644
index e5c5450..0000000
--- a/host_vars/vanadium/users.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-users:
-  - g33kex: sudo
diff --git a/roles/apt_cacher_ng/tasks/main.yml b/roles/apt_cacher_ng/tasks/main.yml
index 3b99764..0424cdf 100644
--- a/roles/apt_cacher_ng/tasks/main.yml
+++ b/roles/apt_cacher_ng/tasks/main.yml
@@ -50,7 +50,7 @@
     group: apt-cacher-ng
     mode: '640'
   notify: Restart apt-cacher-ng
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 # This is uggly, and overkill
 - name: Set cron job to clear the cache 
diff --git a/roles/generate-cert/tasks/main.yml b/roles/generate-cert/tasks/main.yml
index afd91c7..ba8695e 100644
--- a/roles/generate-cert/tasks/main.yml
+++ b/roles/generate-cert/tasks/main.yml
@@ -79,7 +79,7 @@
         dest: "/tmp/ansible_hacky_pki_ca.key"
         mode: u=rw,g=,o=
       delegate_to: localhost
-      no_log: yes
+      no_log: {{ enable_no_log | default('true') }}
     
     - name: Sign the certificate
       become: false
@@ -100,7 +100,7 @@
         owner: "{{ owner | default('root') }}"
         group: "{{ group | default('root') }}"
         mode: "{{ key_mode | default('u=rw,g=,o=') }}"
-      no_log: yes
+      no_log: {{ enable_no_log | default('true') }}
     
     - name: Send certificate to the server
       copy:
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 98c4d41..5f4be5b 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -36,7 +36,7 @@
     owner: grafana
     group: grafana
     mode: u=rw,g=r,o=
-  no_log: true
+  no_log: "{{ enable_no_log | default('true') }}"
   notify: Restart Grafana
 
 - name: Copy the CA cert
diff --git a/roles/prometheus-alert-manager/tasks/kassandra.yml b/roles/prometheus-alert-manager/tasks/kassandra.yml
index 6136298..09c1611 100644
--- a/roles/prometheus-alert-manager/tasks/kassandra.yml
+++ b/roles/prometheus-alert-manager/tasks/kassandra.yml
@@ -35,7 +35,7 @@
     group: nogroup
     mode: '0600'
   notify:  Restart kassandra
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 - name: Copy the CA cert
   copy:
diff --git a/roles/prometheus-blackbox-exporter/tasks/main.yml b/roles/prometheus-blackbox-exporter/tasks/main.yml
index caf3464..a0d6caa 100644
--- a/roles/prometheus-blackbox-exporter/tasks/main.yml
+++ b/roles/prometheus-blackbox-exporter/tasks/main.yml
@@ -42,7 +42,7 @@
     group: prometheus
     mode: '0640'
   notify: Restart blackbox-exporter
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 #- name: Copy the web-config folder
 #  template:
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index 2acae58..aafcd41 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -59,7 +59,7 @@
     group: prometheus
     mode: '0640'
   notify: Restart prometheus
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 - name: Add node targets file
   template:
diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml
index c58dd32..f8eb41d 100644
--- a/roles/synapse/tasks/main.yml
+++ b/roles/synapse/tasks/main.yml
@@ -12,7 +12,7 @@
         owner: synapse_user
         local: C
         template: template0
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 - name: Install apt utils
   apt:
@@ -60,7 +60,7 @@
     src: homeserver.yaml
     dest: /etc/matrix-synapse/homeserver.yaml
   notify: Restart synapse
-  no_log: true
+  no_log: {{ enable_no_log | default('true') }}
 
 # --- DRAFT ---
 - name: Install nginx
diff --git a/roles/vpn/handlers/main.yml b/roles/vpn/handlers/main.yml
index 4cfc2f1..96ee8e4 100644
--- a/roles/vpn/handlers/main.yml
+++ b/roles/vpn/handlers/main.yml
@@ -3,6 +3,5 @@
   systemd:
     name: "wg-quick@{{ item.key }}"
     state: restarted
-  loop:
-    - "{{ vpn_interfaces | dict2items }}"
-  no_log: true
+  loop: "{{ vpn_interfaces | dict2items }}"
+  no_log: "{{ enable_no_log | default('true') }}"
diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index a7fb461..48ed553 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -38,4 +38,4 @@
     state: started
     enabled: yes
   loop: "{{ vpn_interfaces | dict2items }}"
-  no_log: "{{ disable_no_log | not | default('true') }}"
+  no_log: "{{ enable_no_log | default('true') }}"