diff --git a/containers/collabora/tasks.yml b/containers/collabora/tasks.yml
index cdaf3f8..8d5791b 100644
--- a/containers/collabora/tasks.yml
+++ b/containers/collabora/tasks.yml
@@ -76,10 +76,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-collabora.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/drone-runner/tasks.yml b/containers/drone-runner/tasks.yml
index 2c7dc85..c3fbd67 100644
--- a/containers/drone-runner/tasks.yml
+++ b/containers/drone-runner/tasks.yml
@@ -84,10 +84,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-drone-runner.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/drone-server/tasks.yml b/containers/drone-server/tasks.yml
index 7efdfdd..0866d5c 100644
--- a/containers/drone-server/tasks.yml
+++ b/containers/drone-server/tasks.yml
@@ -85,10 +85,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-drone-server.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/gitea/tasks.yml b/containers/gitea/tasks.yml
index 24f05cd..942dc79 100644
--- a/containers/gitea/tasks.yml
+++ b/containers/gitea/tasks.yml
@@ -89,7 +89,6 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
@@ -161,11 +160,40 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          requires: [container-db_gitea]
-          time: 3600
+          requires: [container-db_gitea.service]
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-gitea.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-db_gitea.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/heimdall/tasks.yml b/containers/heimdall/tasks.yml
index 1b9b68e..1abc4a6 100644
--- a/containers/heimdall/tasks.yml
+++ b/containers/heimdall/tasks.yml
@@ -78,10 +78,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-heimdall.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/nextcloud/tasks.yml b/containers/nextcloud/tasks.yml
index f3725aa..ae16c49 100644
--- a/containers/nextcloud/tasks.yml
+++ b/containers/nextcloud/tasks.yml
@@ -106,7 +106,6 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
@@ -134,7 +133,6 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
@@ -185,8 +183,8 @@
           SMTP_SECURE: "{{ vault_smtp_protocol }}"
           SMTP_PORT: "{{ vault_smtp_port }}"
           SMTP_AUTHTYPE: "None"
-          SMTP_NAME: ""
-          SMTP_PASSWORD: ""
+          SMTP_NAME: "{{ vault_smtp_auth_name }}"
+          SMTP_PASSWORD: "{{ vault_smtp_password }}"
           MAIL_FROM_ADDRESS: "{{ vault_smtp_from }}"
           MAIL_DOMAIN: "{{ vault_smtp_domain }}"
           TRUSTED_PROXIES: "traefik"
@@ -196,11 +194,42 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          requires: [container-db_nextcloud, container-redis_nextcloud]
-          time: 3600
+          requires: [container-db_nextcloud.service, container-redis_nextcloud.service]
           names: true
           new: true
 
+    - name: Change start timeout limit
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: "/home/containers/.config/systemd/user/container-{{ item }}.service"
+        section: Service
+        option: TimeoutStartSec
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - nextcloud
+        - redis_nextcloud
+        - db_nextcloud
+
+    - name: Change stop timeout limit
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: "/home/containers/.config/systemd/user/container-{{ item }}.service"
+        section: Service
+        option: TimeoutStopSec
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - nextcloud
+        - redis_nextcloud
+        - db_nextcloud
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/portainer/tasks.yml b/containers/portainer/tasks.yml
index bfc9fd1..d517365 100644
--- a/containers/portainer/tasks.yml
+++ b/containers/portainer/tasks.yml
@@ -70,10 +70,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-portainer.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/containers/traefik/tasks.yml b/containers/traefik/tasks.yml
index 26da5b5..31e237f 100644
--- a/containers/traefik/tasks.yml
+++ b/containers/traefik/tasks.yml
@@ -127,10 +127,24 @@
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
-          time: 3600
           names: true
           new: true
 
+    - name: Change start and stop timeout limits
+      become_user: containers
+      become: true
+      community.general.ini_file:
+        path: /home/containers/.config/systemd/user/container-traefik.service
+        section: Service
+        option: "{{ item }}"
+        value: 3600
+        mode: "0664"
+        state: "present"
+        no_extra_spaces: true
+      loop:
+        - TimeoutStartSec
+        - TimeoutStopSec
+
     - name: Start containers at boot
       become_user: containers
       become: true
diff --git a/host_vars/chef.heaplab.deib.polimi.it.yml b/host_vars/chef.heaplab.deib.polimi.it.yml
index ce59368..9064113 100644
--- a/host_vars/chef.heaplab.deib.polimi.it.yml
+++ b/host_vars/chef.heaplab.deib.polimi.it.yml
@@ -1,95 +1,97 @@
 $ANSIBLE_VAULT;1.1;AES256
-32313436663665626438616435613133666539396132346261343233383836326163306130616564
-3737353664343838373537633061393531643366353434660a316537373738623362343966383162
-61366162653237613437326562313737353663626332623833316230613639363639623336343331
-3239323034303463620a653066396534346338313165366161373036663232323333303962323437
-36336139333663353831633539346464366534623932366230313562646636623262306138313930
-34326130386631346535643262333538383333323835333436346662336365643166613432613334
-39383732333137346238383166366237623363363533306464656364363834353537316232303630
-65663837623032373063373339616436343038336430646537643464333834306233316236316138
-39373238356534626562626365353333643038386134666239623438363762623136643466633066
-36666134346236333336323239396433326334383061313166666565366538303331613330613861
-39666439326435326239663033336666326539396537393731613230313037393365343231363931
-35313261633764346564653831343731323037376463373331326662386435353764666462393832
-37353034316232383464616133613234336365326334343563343233653862633865356266353361
-38303634323861376336616466663264626166396433313036326631646366623332663534323738
-34643533306437633337366530323936646435363636643535396666323632643531356631636261
-35373663653430353863626562633636363537376435326131373438333132666137393661333563
-65366634633064656432626539323463323033363263316330646430633039386236633237356534
-39373861663064303963356137303364306466393633656563393965333263373862313066383832
-35386362386439633530326536636431356261353463663661323666353835346138316131386237
-32383730653162326638353463343734353361393961636331333530336430643032396133343365
-61343237626666363965316662313039633263333165336562313738393238306365623866373536
-32353138636631346264346130333063653139653064653039646630623762643730346630383161
-61666563666233336531333964303261613365656530353934633264333962663239363634666637
-63393765653038653730393836646133306464653166633839326264623439666265653034646530
-34326666393961613862316230343963363739356637386336646632643234323139633263326662
-33353933643336373337626535643365306662353730636665623761386639373664386465653830
-62313434303263653762363962653132663939613137636134636639383235653363383733306363
-61333538613566336132616465396533356566306337373634343233666339646533666564613732
-66656461623630383033333232383435343938393933376130616639386464363734393832663764
-61343832313066336662343766383164616433653336653862306261353232613336366534633462
-30613232353830353163626134646332353839666566633233363232383730633138316634336465
-32396161333639376362316139636663313132383761616237663262666537376562333833343636
-35316530336565343535343134313062666436373236616563633335646165663232653763313838
-32663663393365626335626635383037613166633338323865343362613537373464333464393531
-37626661636539336436646336366434346563333163623662336161643437316638313033336434
-34343161373964356436386435656631383862366530643930653339643565643538303032653135
-30303161303561643439643165393932663462343737323963653332393234366237663830333561
-32363230343734613734633534643265373032656461386231333739616132326632306539333364
-30616562366234393932366433626633343932663930306564623233333864366334306333303663
-66366661376161306466393139383031656563376432383330646338663138333630333636333131
-30393062326431373864323737363935643866633533613766636661393739306235623361323930
-31353564623437626662386431376530323163633939646262366632323932333263643463373938
-64363231653834663738386436346164326239346565376665346365656636316161393962636566
-39356238313065323834653566626664643662666238346461613563386636333635343131616435
-64336563356464333762326336343863633433306566353663653139313466396366613737633239
-38633734383031393339626336373738303832316339653061333361653965313362633235613465
-63353466613130376330643330353135636634313339613934636633373739326661393838613534
-38376563333836646361663433346233633634393430663236393336376361343565396663383139
-35366439313866303330336337306236663834326439613832363439663162633130653365643066
-37633030343039626563666366633533373334666265316437653365623233626632653466323239
-37623936366564653762633534346134666463623232373666626230323531613139643031666639
-66653539383834643663616565656533636263626136333661323137323061316134323838383161
-30623336323935386133646432643538376131306138313264393866636339323862356139306665
-31623636653764313430386437363863633336326330373837366261636330323864663561373161
-62393664346637363938343434343937666462383339313331373963613462613061653863393132
-36326538623339326431343430626162393365653164323831656537613664653264616566343937
-37373362333339646537313266383731643237366362663261383837383230633666636364636339
-66636564663263373638643262303738373033363262393039393464346131663134646538643131
-30336236386131663761633432353565343130316132336234613463346533613863353435383439
-62333339323137333265326361623562366431646165623264393338613263386462393437663763
-39663132356232623634633261643036353733653064383563366165316237323766313138366135
-37373130373731343461326233663834653239626464633864343965366535336562363464303961
-37353235346661633232373734393335306436333166373861383138373835333666306135333836
-38383463393238346562643437633164316331366662636130623532373061363464346263326534
-39346435396330643235386362323330663564613363396265396633613437336663353838643566
-31633432633464663234613438346634643132636139623862643731656539663631396236366361
-32323131356661633238613963643166376538303563633636313164343832633937656233313134
-30343761306161383535626164643631613833383731323166303431366631306338383261383764
-32633330333731303164353532373034323633653130353062336266313265366637356635333965
-66626464336161356563393631616461616630393865326666316532636263663164376436313436
-35616466653030643237326439656539353235303130656138356539366364373530623164306561
-31303431643034646666393963653862613639303936336366363832616430623962383462373733
-65323530396533316233373339363530633761633132363161313132646638383062313630316663
-61373466646236313062383564336266376366396132333532326137623134376337333864313533
-31306237613634616437613266626566393135386663363062646636326230653461316232366164
-32363962313039353463376631646236616637363832643634646531613262633334353135336566
-35363538623735666466626565656430313333373532396662323865366133373962353838343732
-31633064666566373932666535303039326337323362393236316237343939383033386237353336
-39663164666265386539333234303661326136373962303966633566623238343361333837383133
-66663436663366623262646433353765666335333164623238366437626232373338326164396465
-38373636323966363633316662396162326261623533396132326338353130666265373332333138
-39626537633337613836613766313730336233633337666539623364393739346139313030303238
-33613463313038333237613739323835346664323033306631623562643166646435616636363037
-34383637353865666530643538623865343139613637303238636139643162313761343831373066
-35636364393466663334623838313461393234313462306633343132373439363937316266393862
-30303938666238613937666165316662326532313531616231326234363034643563633735383461
-34383137646464323434636531633737346365666132353064663563643330346337616161326431
-32383364646137616265383064376235363435353636323762613232383037303534633133373535
-62313839636535346161626663666438653235336334666631343764333163316639353366366334
-63616463663337653732313432303463623034653865666136373432623164663534373239333632
-61333535363463373632333231643136373634613537313438366461323434343935333432333537
-62643336663765376131356634343562633238646162623565396661383738376339316533363461
-64333265316331346137376664303962313661636635396130323035373335623135376133653431
-6361656138636537373730643039363864366332383266323366
+65383561326539386434636536643561356462633332636236303131313233353336336337336261
+3733373262373562666663306131303436373163356238330a313334626637663935333265633434
+37343839333835633136383632626131316138353431323764666566303261353562356565613063
+6535346132376635630a343266383365636536653331356130373639363033663262623330633532
+66313462623161643066663731386366306632303062623366313734396263373237653239356239
+31323333386234333038323637316537613765656633663732633732343635366563626331633535
+63313162646237396563633966373636653837363162393131386263626336393637666561306533
+63633863346337343439633662303638393162366530643230646462356134346362643633633635
+61306131373239323464363436306165373630306230643031646134373238643834353338643233
+64316663356537333261396430633834343434326363323137663062626364666338356263333834
+36666163613562343332313035313464376266633566653133343933326166623634323731396361
+31373861363966363261633730656133366634666639346338396435353066613965623766323666
+37373338326633333038663836313438323030333436616365323261363532333431643539396564
+30343630616431353565613433663433326338336366363733356564373039326262376334316335
+61636262353061303430373832643463353361653837316336616637333463376561333565363032
+39313533346138623965663830346664646361396664363666373138383065363338313938623436
+31656663346164656439616639643565613737646431643666346364643862383732313937316336
+37623762386362303832393663333266623635643831326665633134393065346466633233636366
+61346333303031646337366462636539346436376565376135363337306330613963643462333862
+39613634613832373432643834353737356562653637626163386565353237643535313834353362
+62396436353435363263316664393531663763613236363638663139633864666132343765303836
+64396361396233663261343264383732393463343638386438356665383237376330316266373163
+35373238356234316231633737336262343237393865646630306436663533396137666264323561
+63393739333432343233343935393130613433363966636262323366653134626462326532383836
+36623865623739333231373464643134383239613734323832626239373466313461343034636631
+36663132643737643337626664623033396532333636353761376366346366356166333164663732
+64623234623733366661373363366362303838323239636233363837636530656337623336633164
+36633435313935323636623165663262646238363265363664653265316438323835396231396463
+34643633343833366333663064383335303263626338316132313730616437303861366631353339
+34353164646364636533616435316231383836363065383039663835303763613966646237643162
+38656166663937616264383331616639646662366632363665323566343434633063333361303639
+65613131323137653663616331626432333562303236663261623664353964313330373461333138
+39636638643731323036386237393339623835333337396563653938636261373536373464306162
+35376534316638343166356639313937393739336662396536386530613831343430383234316334
+39396666623463623261313663376530343030383334383430323639346135383937646562383038
+30636266326531363836333331313136343631646134343065356162316231626132626362616431
+36313062623365376665663433613236386331383339613736323866633138346539376437363665
+34346430646463613031653835383934623863653637653266613035303162386466643835306165
+35616436373230636633326536306635333333656164313835663239636432666332363738343631
+34363735633336303164333065346563643832333735653066363639613238653735656535333362
+35346231363938356662363838643563336231306366663966626162303563666564326564376164
+38643066353963666433313031323930656366663465626430356631376566646438383161306262
+36316537316566343665633863306535376162663932353036383233393463386339383764313935
+30626163366262343635343463643964333164313637613533663937636633313262393161333934
+65376365323932393365303231646563613237353736663236666465323435386464386165636633
+37343233373837643432333434643232623762316163363333623433346535663238653263646130
+39343966383262386534313531336633353031353438353733613433616631373863623931623130
+33613565656435646330386162356633343966323165613466646236356265643535313339333462
+39303638633664346334376432316537306561336564363766656238653634373063353037666666
+61663031376530366362383734373838616165346163653764336134343234313538653039613934
+39663033376537643166633936663838626462343064386461646365356530363966613830333338
+37323863613864646130633862343761636563303566653137623863353363373735613137366132
+34353830333565303931343630396634356561656461316232633630643966343965646261396462
+32636637633333393831646361316439313661653963333939333564383865323165383264313538
+64623535363964373636303233343534633235613938336261613132656161333161373265303831
+34633764373837666330623236376263306334313861333037653831616566333965346339353564
+61343132376539363036383431353931626235363930626462663535383765646237643461353565
+65383435386263376635383232323565633139323934653235376435633264353637656137316536
+32653563666539386239376265383937656434353338373733303934616233383937313065306631
+36373635323362656462393364303034396136623764316138616537653862356364303331333465
+64616631613437346232633962303036383864343130306263633534383266316430653136333231
+30373632333738643565626365356665653535373061323666386264396265343531356433326166
+35313065636564353861393438643161653465313833313830313631643063343766646666346236
+64643137306562353730636439636565346236353832626563343433393366343165616664356465
+33396537326434313535383737643033373533313939323331326665396637646434646137376262
+39303536636635313565613862393335306330633666383138663133366663613032633265313138
+36336238623231326362306234306636666631646262383231666237323735323132363664643763
+33643561623964396565303163363334396364613934336330663633626366323534656531366665
+62663132663834663032356138383032633135373634303463313662363736656435663932326463
+61396333643831633937383531313239353565346465313030313831393766346662383435666633
+30636164663238313335653766626637373835333936363361333539646634363066313662636562
+36373737383235633961666439323130646338323637623531633764323531303362333433386632
+37663665333666373465336533633466666131626363646633623466383366313730386131346632
+37343761356432303462613732633062656265616339373638373837646463636666336361616338
+38363962313866646333363335323937653035303066663239313233313762313963323138633835
+33313563303463323330666431343632326130616630373132333135393731333437646531643833
+32666566366466323935616663616665373166336665613238666364656164373534663039663135
+36306230326536393066323663336266396637373234333435306666313137356262303266333333
+39356161663239656164633835636563313436393337663762303435636132393161383230656434
+64303066636361356665396638333735643461343962313935303730643163363239616462373934
+32653762616635633838376631323838356664626236363134373163656139386365616363653835
+62366465643861396461643364303763653437333938373965656434653531333336303037353965
+32643735623464363932653238623136393738636631386335366163333461333765356139643662
+37316164633966373433353631373066306565623832313034353866373933663730363330646538
+66393630633366633730666463393263356335393037653065346564363164616363346566336238
+61643963363633633866616139346536653461303538346337316436326431363561386531616537
+38343634373630333036353465363632363334363630323531653339636163636332316335623162
+63653834663536393938356232333833356137656434343363633339353539313662363535303266
+38623735323638336533373561346338396535326336383638386337316539313831393537353462
+34636563646439616433373338383666303539336263653335356366353634613330383965356132
+31633639613335623062333064306430363034646439386636663136666333663861623230383333
+64326334363636346465376561653161343531323966386133623365636534323338386238383139
+38316533396566613233656638356330366461666630303932363965613965326532633034373332
+39383864376233356466636236666436636662396564663334363663343231356434303938396238
+65336337616638353433613830313532643665623863323266666261643134613636346562303563
+39373338636635383161