diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index 14df760..7299c2e 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -1,9 +1,11 @@
 ---
 
 debug: false
-send_status_messages: false
 
 docker_enabled: true
+traefik_enabled: true
+filebeat_enabled: true
+node_exporter_enabled: true
 
 use_ssl: true
 http_s: "http{{ use_ssl | ternary('s', '', omit) }}"
@@ -115,28 +117,17 @@ wordpress_base_url: "{{ wordpress_id }}.{{ domain }}"
 filebeat_certificate: "{{ stage }}-elastic-stack-filebeat"
 logstash_certificate: "{{ stage }}-elastic-stack-logstash-01"
 
+#ansible_vault_password vault >"
+
 #reverse_proxy_admin_username: "< see vault >"
 #reverse_proxy_admin_password: "< see vault >"
 
-#mattermost_hook_smardigo: "< see vault >"
-#teams_hook_smardigo: "< see vault >"
-
 #hetzner_authentication_token: "< see vault >"
 #digitalocean_authentication_token: "< see vault >"
 
-#pgadmin4_admin_username: "< see vault >"
-#pgadmin4_admin_password: "< see vault >"
-
 #grafana_admin_username: "< see vault >"
 #grafana_admin_password: "< see vault >"
 #grafana_signing_secret: "< see vault >"
+
 #grafana_user_smardigo_login: "< see vault >"
 #grafana_user_smardigo_password: "< see vault >"
-#grafana_user_guest_login: "< see vault >"
-#grafana_user_guest_password: "< see vault >"
-
-#vault_ansible_password: "< see vault >"
-#vault_replicator_user_password: "< see vault >"
-
-#mysql_root_username: "< see vault >"
-#mysql_root_password: "< see vault >"
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
index 0607b91..e9b420d 100644
--- a/group_vars/all/vault.yml
+++ b/group_vars/all/vault.yml
@@ -1,60 +1,48 @@
 $ANSIBLE_VAULT;1.1;AES256
-62343434633565373061363464616564363039373130393539336533373631396235383162656434
-3362626630383635653434626330616334343164616336390a633735656236396135613439323863
-31353038383438373437363433366537636536366435393534633837306234643535373232343138
-3365636531386364620a643030623934356230663038623462623763316438323266333762326336
-66663934346636653937656533646630613762346538613465623332336165666134353136373734
-34373464326166343764643461363039636264393539306461663038373137303431356633346435
-36326664353163376535343231663532363431643837633762666563656639646438643836316261
-63356633646432356435343038323161363961376265333233616133373533643365333062383937
-31316165653631613130643435633765663331383531646633663862643466646334373761373664
-39616165363730336237396134346465373035636365363338643931616364343766623733656431
-64356139623332373230333033373761323038663234313338303334656437633364636336653962
-66333761663439376139336436326631623464303864326235356262346636613764353264383934
-33666532386536373433333430313139313839366234393234376463663634356332376365323339
-39646138353233636565353131656534373338313935326232353162363331666337313636383835
-34373564353564386335343738613363356134343463313237636130333732333665653061343764
-31393330383635356661313035313931353066653734373661323337633737666638613638363331
-35653739353931623762333235653430306336343036636665393334326430393737646465303135
-39326339383066343866346164366562373139613633363539653835663435316664386266326666
-61383263316435356164323737333132303861613234616462373338346630313033636364343061
-31636334636534393534373232323134636363653032336566383762613666373134376462383162
-35376465663831336537323763346336636133626334393530393030303334656236323266636139
-66306265333866636562663730366434656436373137313662373933373738383662353332326236
-35383266323964653232373038646663636636313731373865303266353336333031373133343732
-38333837643433316263303537393064313462633738333662383630353633333138666265386238
-37323165386438303232646136393961653832666237623836666664323662373337333562646333
-64353038623732383634663731363037326364326438363664326335656639626565636364656537
-37343662393366356462323837346130303532613133333633353534393032643338353235346530
-30636164646465303231643831366636396539373235383966613639653730653965616634393662
-36633030343065653931343265623731383263626130623838633239633133356462613832336633
-36373062626563376661383261343163633639373566613163376562646236636535366230363438
-38653164373266386134396239313532626231616435383063343237333032313432333364326234
-32626235313833323563326437633662396566313464346461363336353539666637376364616465
-36666331613335646137346633636439353666626236353937636433613637313030373762653732
-66343866306662303061626637346133633435333832303531346265306234376133343030353064
-34633861393231316633356631653837323965356531366530343838386366653636663435646464
-35613464323639343038623062376238663262623134373938646566623963373761623663343364
-33656237336363363932646139346561656434343130353935346562623564396337303132666538
-66326139633765663836373231356630333565353562333364396332386434653661306366353530
-65643634656330376632343637303932646438343261313738383530353730393332653038626131
-37386632386464643038356662663936336332313961613463333132333064663166353538353162
-38393230343039396536666462643766623934366363643561363238326563393461333539636162
-62653430356164346537383737383166646338613937623364656339656565656135373239383264
-38353361653937373132646561613466626636333136633630363230316262376633663931386366
-37343539366363336430366532336431643462636366346265383338326231303736653161323732
-35363264353864653037363430633035363838666338393137323864326265653161336636623736
-61303965633264636266353362666339643965323630356632666337366536306266313230396635
-34376631613338343731616230366531656663373064353731633538653134656334323731386265
-30386136303933316435313939393533636361353637626537663438316563353361653664616463
-61666332343735666131666431353664323533343634616265353532313331356431633632353034
-32346232643939383039316365643230353232633863366663636139336133313735636134313061
-61326364333536616538336236346161643564663636646164343863356634396439663037613934
-62623863336663383038326332333035653235353339396133333434383764353261363230653662
-35666437613038636130656535363133666465343130643539343261373065636132336231396435
-34626632376235303839613266346637623331353364313431633566316464363634363561653263
-39373863396262306565313364656465383462396266626465306332313866353435316134376431
-31623939363939326165636461323465646631383436336430313634316162363561663361303262
-37613835306531313664306335613834303463396436356362626631316530326365323761333666
-38633732306262376433396137386535663963333863613865616437306335373236653635336634
-363438386662653938333533313931616635
+38396164656230343461353837306664386634316464666261396232663936663064343932323136
+6438343938643639383532613165633937663861356165310a613033356339353738396235336365
+64616637363730343264666463376235396266636239623365346363366433313363616161636336
+3362313064393930340a366330393765393439396439343534383538343030306265643635613935
+34306237616137643535646235363165313632303464653464663966346365386232623637616165
+37626562646230393530633063396161636361376464313763316434336530303432643939643330
+37636433653330336435323333323438373832333538623966623062376535356562383764646133
+33373535343965333865653337663331633335323330323636663462313462396165303537393266
+37663338616434343438373535636133646461323730623964386538363066303963613864303234
+61373862336538343261366262616435313065336435386461656561323064646237366136353136
+66383733376434626537633438633434313263336462323964656237393931323337316362316663
+62396133383833646635666364303337393762313063326231633034316635643232353265663762
+61316233393434323764363638626639353561653736346437663230336238343466343065623963
+33623932616137376264393261653964616634653039393637303035303238333564303761343039
+38343665313964623232323864396236313934653132343437316338363763383532383762346334
+39383365343536616132343361386135303933643237616437653463373965633536393235366163
+62653937666437393863333962373433386437343361663163336163306335313638316161383133
+30316535623232653733396134356132336435653762626264363737623338396266373531353430
+35323765303236363266643632313964303332626136666430326431383132373430333866393738
+32613035383364633333386538346430663862643531353438633061613530323863363861383435
+61376561306130623561326561323930353832356438313363653932643831376430373039376430
+30623030323030653234343565303331613036313430326430373962316561653832353365643334
+61656333306366663933643636353832633632643565646263333638663161353839383362313234
+31306237323366396135663334356336346663393339346266613238313633373832633033613630
+65633734633362323264343934326631393937303334393336353637316335393133386562336639
+34393262353935323438316339613566613765613864393231353262613236616238633634633562
+61303737656463373365373534623339303337623936613261623666393834623338623539663332
+38356130343838633165346539386131303636386437613966343562616265366161313139316665
+32636538306234653938373334326262656131643735646436313330306536663339323962376138
+36353866663861616338326338366263343836633761393263623638366434666266653237333136
+35636661336532326237356463356437663037346265303830373064373635306130313037643830
+64353762373334306531653631633531306338633261646334623564366135633734343737373266
+33656236313664386463643466653864616538366537353231323931393363643633353562313135
+36636637663235333965623737633635396230663737653736306265393861316265386263353639
+65626337663231663664363537616239303631313438303534646161663762666437636233306363
+64663065636362633634313336666430626162623663376666323166623339346238373637653561
+31613562336334333536366662666239333933356632306563383537623263353665613466396237
+32363761306235393632336163386161623134343734393664653565303038633863333166653738
+31353530613262663332323561303863663631316164613432363336383836626334616432383337
+39366533343432356561353039363965663035343065616632633766613063663365623461643835
+63373863326666626431626232373737386363633536393439386635303864656563373165393438
+39353661316433653765393237373636323037653330336563353438383362643534353965363730
+37393562333134343733633838303030396131313365656533343165313964386661643835396166
+30366439383634376433623231363061356638643033613163653937336266306238656566316266
+33376361386635333932356637633732633865613735376537316539326461643235323965633031
+64653133663963633638356236346265653563396437383636383464646633353434343566643266
+666562356661386639633035653065383332
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 914d210..782b58f 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -114,6 +114,14 @@ smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCR
 #elastic_admin_username: "< see vault >"
 #elastic_admin_password: "< see vault >"
 
+#postgres_replicator_user_password: "< see vault >"
+
+#mysql_root_username: "< see vault >"
+#mysql_root_password: "< see vault >"
+
+#pgadmin4_admin_username: "< see vault >"
+#pgadmin4_admin_password: "< see vault >"
+
 #netgo_msteams_hook_alerting: "< see vault >"
 
 #docker_registry_oidc_client_secret: "< see vault >"
diff --git a/group_vars/stage_dev/vault.yml b/group_vars/stage_dev/vault.yml
index 9dfbcdd..6ad16ec 100644
--- a/group_vars/stage_dev/vault.yml
+++ b/group_vars/stage_dev/vault.yml
@@ -1,44 +1,54 @@
 $ANSIBLE_VAULT;1.1;AES256
-39363234323636333133306663393739373034666266303863346531343834323038643463353362
-3062643837376335323235316137306233326633653064320a623937333136353734346564623862
-63343639396335343433396363663937653333633465363666636162396238376330383531313031
-3436346639636639300a643830323035303338653764336565663531663531646362373537613332
-32393135646631356132366434643131666438356464626235396130326636393866303165393763
-38323464623737313464383539323034356366346335623131333264613263363537633565393433
-34623235333731663865316338383931633034336137626365396230316465343034303636626336
-62306230393931666233373137346466393336663465373064313534386165336366366138376137
-62626139626264643332346436386138363539623634626366356431636261313730306634326462
-35643065373230393837653066376537353632373466613337306230656635653631346332326562
-66353634303966313336366366393535636539643935373837663264613865326266613539646562
-33623738313563343032343833346665623162363963313833346664613334303834316130316237
-61633033383632306465613661343631303432366633623461306332393563313937646434333564
-63643935323532666166303734343931373534316165333137323463633135343731313635366639
-64346630343735353639343164336363336133373439326563336666313332323632333062663731
-61633166343261306437653138353163396630363435303637303036373865636434363030346161
-30323962303366313135653461343838663962333262636336323435613635613537633232333663
-39633139616365393930626534346664656433643530626237653963623138663337623933383866
-66343636316661383539663039313864356337663562363835366539636363366239633564373835
-36343434616163333938316138363138366238646134386532633438386331623633653464313132
-37626239366638303237376336356565386635636430643830636237326431663964346333326437
-61313433306264346265633463376563633534303438376238363036653135666337653833376563
-33633261373635343537376136623638656137636436323031663939346362643337373837383537
-66373032313364613966616439663837373064333764633430343733376236336261393161336362
-66333432356232376630633464303766323335303235626162633633623865373964333437643762
-34373365383766353066613832343732643966613837613265646363636162336561666162326333
-39326564336237356166646132646266333864393262313530633335346130613530653165386563
-30366431653666333132646166343935376431653230373736323735626565346232653336373733
-39393536356330643233656564386162303266626664343630386363616465316363613963613832
-39346530616330326561396434353766396539613062353366663231336235623438633765306566
-66396433323834373365656263623365313437343763356631613237633666613836356237663334
-32303638386632303462343132636663336336306565613634643534623939316164623835373964
-66376163336538616139373766616265313665323035393433323862303232333230326265646630
-39623361383966396262653666613263353965383435656663383731313830386235613934376163
-37363533383331646562303934333363333564643364313531306166313437626633613336613230
-32646136303062386435376464656462653463653732393163306462343935353235363464333736
-36656134333834326164386563333463303235613631666638356633366531343332393033363361
-36333833383234373030393164633635323932346236356565376462386332666461613739356337
-62326563643734336631316366383238303263373538663863313732616565633461336130343036
-64643733323237306332316339313936643739613831616339393665636466656466356164393335
-35343833303830643335663735653262396435393636336231366535316433666433383130646333
-62396634326538383737663263383134333564623237323132346436643133393765383965626232
-373662656462646139363435383831323537
+35346362306332356236376264393165646266386333313561616633613661363634323031363937
+3564323261346239313539626166373031653531653430350a353766353239353262376366343936
+63303633383837323533643461373062373833623864373762326538383332663835306465346662
+3536353130653762650a653138663463306661626365653430396636623532333061663632336564
+34353130383534386236323030613130636366303839363739643461633866356136623761633564
+66333239636363393030386232323535343363656266376537393639656131633630333362373437
+33373363326535316330353463306434346237663439343461366634633765383633336130663233
+63633933616537363235373132386232386538323431313465306338613665306237333039626164
+63333631323436623631333739346134373738303864316264343837383731323831383563633235
+35363332383338363832646166663630393930666531366335366533313433376231613032323134
+63613238326135623032653466616338663633633465363630353761306636356264653765353534
+64343062373339393563373530343065313233643862653839343265333730373537623230353135
+62373337346530653263343631333937353538326134383332646263336661623134383965393861
+33343031663139363033383935373161306562623066306462623730343763336661383037383137
+36643439363635343865663133363931313661383234386234393161313137303038653339643565
+37326365353166306533376263396230643830633432636338323537363636326330313863613463
+66383236383339326165373836373166366434343531316631356132613431376263353231393031
+65356265336132383337306632313365663266633133353062313531643966343338636131316437
+38326438313466366336386531643733393932613935646364616433646238616433643634333335
+36366263646466666639626563613631613363353535353465396330653365386262633662373937
+32643462343730376536613062346137633865356366626263643363386434336361313730633139
+37323135393036613838323739333236376363636536636333666638356232616233666462646138
+32393938643462656237396138363463323966633334366334636465396463336533656265373030
+31336330396266306233613466383036346164653337343762626338373538316339353963323761
+38386266313564303733393361633735313762373932383763633262636565363565373863313763
+64653666666633326639653938613364366463386537663330373630663338306436663561363035
+33633035633335306261323164616636363561343332336534666564633964323463353039616431
+30313833333933393637356563343336353034336432313861313163663732643635396135623332
+61373734343733396233336462313831623335643133353933653635303636643038343737393566
+61656238356436306365343032346432616630373565656563303233623961323062313863633037
+32653761356662386566323934303735643062643865623661646366336263616636393736636335
+63626530313237373962343362346137656230646437306265353030386234373235343735303638
+65333131666435333464303338366662396565353636313237353830336366343561616634363439
+39663638396236633432613236333561356537626262626431663437353331366462366534383339
+63646337333463346136383966333535633731303631633966636130633539366334333534326336
+38316565653561636339643864613633353032366166313763336264396130343164663737356362
+35386561313235643664356264656432346266333833326366666239303361666630633266346262
+65643235616637356133646335303565353162323965623331363964333632646366323637396630
+31623234313065306431616231306134376636626232393231346636663832396266333864373130
+61356434306534393566393931356331326539653064326637393930623133346164646231626165
+35396135376532373830396236653161653137633062376437303339663433653133383630633662
+65663165336237313537303431343933333961366633333565656165656336613331613432633733
+39646538306636343839383466613333316534656131663866316334306564316135383837653964
+31393365366461356532616563353137656262323438353063613739333835323236333335353862
+66353065336663623038323130656433656231643439633133346333663530313738656461396366
+39626461383339333966626235613334343439656631653465373932366163646332343063303666
+32373133616164313034623638393438613834303133363134623562653461306430326135616663
+61323662633837613531336337386266623535316235373730616362663662363734663561363735
+62363766303561363930386139643632333565353733353338643863633261663333643937356135
+62363561373165343632346266363634323332373735633039393235383330323035613830656166
+32366334636336393065326564366361383264386335613630643166353264323032353262393865
+34333066363437373636643432396262366630396463383334356664643337646530616135316438
+31373563633637313464346637363262303430616463363632306364326339643863
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index b5808c6..438583c 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -130,6 +130,14 @@ smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCR
 #elastic_admin_username: "< see vault >"
 #elastic_admin_password: "< see vault >"
 
+#postgres_replicator_user_password: "< see vault >"
+
+#mysql_root_username: "< see vault >"
+#mysql_root_password: "< see vault >"
+
+#pgadmin4_admin_username: "< see vault >"
+#pgadmin4_admin_password: "< see vault >"
+
 #netgo_msteams_hook_alerting: "< see vault >"
 
 #docker_registry_oidc_client_secret: "< see vault >"
diff --git a/group_vars/stage_qa/vault.yml b/group_vars/stage_qa/vault.yml
index d354502..232be83 100644
--- a/group_vars/stage_qa/vault.yml
+++ b/group_vars/stage_qa/vault.yml
@@ -1,44 +1,54 @@
 $ANSIBLE_VAULT;1.1;AES256
-63343830383638626364313664633436623032353161313137396334396634386537373066616437
-6137616665633433313335386539363736306231343033620a313034333739363263343563383130
-33356633613234363639393938656233346165346463613164303136653336383336353536313162
-6135373032326566380a623364333731313339636139666266613536343831313834363331353165
-34376564353332323165623663396664663433663064376666613165323936343237346630616162
-33343630323662306135613564636164666639363561653364336665343065613437616135313639
-65346664383834616638643033306537386231303039323161613830663731376566613462633831
-39363035346432626139326231646461303362306466323834623333356364633535363233646231
-34353265613565363331626238613034306539656238303031323161343331656436653835353636
-34363061633439383663313863373530336430396565366232643735356539636663376634376464
-66633538303534343433333138343539393932613635616231333436633764396234333061366361
-38393063343135356331336437653966356264663635353362356431633362373662393937396636
-36336164646361356334623834333434303736333430653131623133373163336164386562653566
-61303465653561633163336662383237363537636132623734376335356636636662623037663334
-35303962623063633563333635353964356533323461306136666134333032336335613437353731
-64626338393939336632353261386337636131633233333066393762663763363465376663353837
-61393132363630366662353838623863383335343565616635646330623038633130643861326339
-64383566306336616530373234366664343233323864346234613639346163663336353831313630
-37306363363334636264393238303031353730643239383366346239373134366531633665313430
-35313662666131393266383235386364363637373031666165343063383562646362393437336364
-63633535396261343132643334393736303162356436303932343462336361393538616530363031
-38633465646166346638383937666566353366373531666661633430306465376265633762353861
-30343764396433623865663836323238626262343631646365613066643565383735343437643731
-34303065633732323862373766383135346137356131396262653238393466303464623265633061
-64353861343039346661653833613166636535396635343761613763646666626136666439303164
-37663637323166643762303939306339356265643464666265613632393661333639323032393834
-32646339656238383038363832663338346331383839326137636136343630333033636433346636
-39353636393261643932653566323537633265653531636665666336393436346338626534653066
-34613136393032346331353265383138383732636263633734613238396566386533323132383034
-61306636323439353336353562346132333662363438333466663965643962353162656565613537
-33353737626631316331663562653437613563636535623334303764373363386539386462343364
-36393533623930393163366434396663323462656431366437613232396163336533666434386239
-65313961653063623232623865646234623137383532643362336232663930323433393362623137
-36333236323430656338646335353935313565663062383064323062366234313432636638363533
-66626630666631653738353231303435346636353837383465616430346439633464356637353563
-32306362343938346232313632353632363439353031623831376436393438626161663465363032
-36313032313336323235353261383831653261613963333131353933623030393961353538303439
-38323163636661343039356166653632373634323232663263303561623533373333663238343038
-32663961393930626663313938386361396431633739343764313836363562303365306137316134
-38636565616432623337396265646336326461333663333963316166393962343062383231646436
-33366432663066653832613831626165646563623838383733303337666637616234303239613035
-30336365336439313939396561613366326333653863383732353632303963353236323338666336
-653639353866333433646632353239623862
+63643334643863613366386363363366363964323236303463366232306234616430653434633137
+6366643532363464326236656330656532653739306665310a623363303665376266313363646165
+39623538656539346531653634393365306532376535633138626633313332613363336235373536
+3536643266393137660a356364393039356236346462313638333134613732346539656634313031
+65646237623764363034353064366534383030386236616332336638366631633837323236393662
+31333538616339373463643530333133613434303135346264393366343530666432353435366430
+30376235376663303866613135646538613836373366663865623336386435326662356264366232
+39383532356165353363313837616333313564383636363666633337643162383663633832353162
+33623835343361366337333534366539613636336161333031366538313333666564306130333034
+31376138393866653264393732343266346631303465616637373134323632353634353632353533
+36313534353936666230363363616335646638336661373239326566313766343634373338613736
+64333466373235373366386334363236363039623639656366623735306265363933306137323437
+34623930336464373139383666663538393730356532363637386330643133366163616365646161
+65396438306432323935633231343039643338396531343564626330376539653836326133333736
+31616262366437613739646332376361313733343130383539323534343430663934363863626462
+36643361626138633062343339333731613662383831613834366132666134656239326338353532
+31363633623363386533303261376631316432613137666330653237656266346135356539353465
+66623835666133353936613432643262616130366266633738663137623031316561366235393735
+30323034316337663863373839666130373333393337383433666166616435333262633932656534
+35376130306135333830323330303962366663383039613831323832623932656433383861386635
+32363662363535613761336133303266323164656437613935343766616437323331343461303734
+36623461366232326135393265376130646436333461663430663431643738663765646163613262
+30376139396533636231343866626232313632653931663539643363646539643136626133363831
+66353461303564633266656265363034313761333137346630643435313865303638316465653264
+35383634333561333461363537303137366565303135383466643632653331363039333134626366
+62363765383439306665326165636333623133626661366133353130353665666339626631333531
+34653339396238636634623839313439333261646363623135646438306136656432336433383265
+66353061633962303231636632393562316435363162313264393633393064373731333936653262
+64633366643332386364323662363763616131386631303132346536636237326562663231333934
+65323139336439396163333138363432306366303038313739383532353032383432363361326238
+62396164326437626237356537353836393733313430613163663631356263306637626137326365
+38303839326431653061623433383837383761316262626363383139363339363430636136636337
+66653831656233323764373361626462303465616138343264613630363239373538393533336631
+30303435363639383332656133346634353861393534613232636632343862303239313936373331
+30376533363236626438613265643436376265373137643934316464663732366232366438623031
+65383834623165353961323933366361613062643931616135663533333562336131636366353538
+65396439636530316530303738383438653465636530326232313033393165326132653530383962
+61336136303031353438666531366336323630643564363663333839643435666661303566653263
+38303337643565373033373762373836616438356262386363313438663966393164646230613637
+36613963326131646264306261663739646166636262633162663038333763336533303266346562
+63303338306530346232313033646362386331623564333061383163323736613962663835333732
+32663935393665386337663439363735333164333164383939633632366531363435656137383164
+33383730316363643636386266353031303334356439343738323061643264663339666238353866
+33396237323966636365376339373639633766643531613464353334363833623564646238303263
+34396662643533656137633931396461333165393762316631343162613230373033656339386539
+34396163323637303737336135373637343438616265326536373039613866343766363838633630
+63313036643765396662653335366639306464376431373166643162336533663463393235396532
+39653239613063333265383638633631613463336331343963353832636566356562386565646533
+30303237653161653734663662383764666532663033323433383530636437323830656266376364
+31353236633761666165616561366630656231663831646633356136343030633161303366623835
+37373034616234323038386464643762373437356133363938656538313932346361363839636365
+64663265376362666436626563626438343938363239366564623233396461376462613261363534
+36386336326132636666383630626233666561643036303766393962623533323463
diff --git a/roles/awx/tasks/awx-config.yml b/roles/awx/tasks/awx-config.yml
index c8ba772..79b82ef 100644
--- a/roles/awx/tasks/awx-config.yml
+++ b/roles/awx/tasks/awx-config.yml
@@ -200,7 +200,7 @@
     user_id: "{{ ansible_awx_user_id }}"
     credential_type_id: "{{ awx_credential_type_vault_id }}"
     credential_type_name: "Vault"
-    vault_password: "{{ vault_ansible_password }}"
+    vault_password: "{{ ansible_vault_password }}"
   uri:
     url: "{{ awx_base_url }}/api/v2/credentials/"
     method: POST
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 25c3fd6..b69765b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,24 +1,10 @@
 ---
-# This playbook contains common plays that will be run on all nodes.
 
 ### tags:
 ###   users
 ###   install
 ###   config
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Set hostname to <{{ inventory_hostname }}>"
   hostname:
     name: "{{ inventory_hostname }}"
@@ -224,16 +210,3 @@
     state: present
   tags:
     - config
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/connect-postgres/tasks/main.yml b/roles/connect-postgres/tasks/main.yml
index 381e4e9..334cbeb 100644
--- a/roles/connect-postgres/tasks/main.yml
+++ b/roles/connect-postgres/tasks/main.yml
@@ -1,35 +1,8 @@
 ---
 
 ### tags:
-###   update_deployment
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
 
 - name: "Setup postgres for {{ inventory_hostname }}"
   include_role:
     name: postgres
     tasks_from: _postgres-acls
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/connect-realm/tasks/main.yml b/roles/connect-realm/tasks/main.yml
index e9fbf1d..795609f 100644
--- a/roles/connect-realm/tasks/main.yml
+++ b/roles/connect-realm/tasks/main.yml
@@ -1,20 +1,6 @@
 ---
 
 ### tags:
-###   update_deployment
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
 
 - name: "Setup realm for {{ inventory_hostname }}"
   include_role:
@@ -35,16 +21,3 @@
   include_role:
     name: keycloak
     tasks_from: _create_realm_admin
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/connect-wordpress-maria/tasks/main.yml b/roles/connect-wordpress-maria/tasks/main.yml
index 0266c8d..2386ff7 100644
--- a/roles/connect-wordpress-maria/tasks/main.yml
+++ b/roles/connect-wordpress-maria/tasks/main.yml
@@ -1,32 +1,8 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: "Setup maria for {{ inventory_hostname }}"
   include_role:
     name: maria
     tasks_from: _create-database
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages 
diff --git a/roles/connect-wordpress/tasks/main.yml b/roles/connect-wordpress/tasks/main.yml
index 5224de8..3afaf71 100644
--- a/roles/connect-wordpress/tasks/main.yml
+++ b/roles/connect-wordpress/tasks/main.yml
@@ -3,19 +3,6 @@
 ### tags:
 ###   update_deployment
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ wordpress_id }}"
   include_role:
     name: _digitalocean
@@ -76,16 +63,3 @@
     chdir: '{{ service_base_path }}/{{ wordpress_id }}'
   tags:
     - update_deployment
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/connect/tasks/main.yml b/roles/connect/tasks/main.yml
index 085bd60..ad285c5 100644
--- a/roles/connect/tasks/main.yml
+++ b/roles/connect/tasks/main.yml
@@ -4,19 +4,6 @@
 ###   update_certs
 ###   update_deployment
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ connect_id }}"
   include_role:
     name: _digitalocean
@@ -91,16 +78,3 @@
     chdir: '{{ service_base_path }}/{{ connect_id }}'
   tags:
     - update_deployment
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/harbor/tasks/main.yml b/roles/harbor/tasks/main.yml
index 5e2f728..9a8006d 100644
--- a/roles/harbor/tasks/main.yml
+++ b/roles/harbor/tasks/main.yml
@@ -2,19 +2,6 @@
 
 ### tags:
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ inventory_hostname }} harbor"
   include_role:
     name: _digitalocean
@@ -93,25 +80,3 @@
   ignore_errors: yes
   tags:
     - update_deployment
-
-# TODO
-# sudo ./install.sh --with-trivy --with-chartmuseum
-
-# update nginx onfig
-# -> #proxy_set_header Host $host;
-# -> #proxy_set_header X-Forwarded-Proto $scheme;
-
-# update compose file
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/iam/tasks/main.yml b/roles/iam/tasks/main.yml
index d028bf5..b76e2ea 100644
--- a/roles/iam/tasks/main.yml
+++ b/roles/iam/tasks/main.yml
@@ -4,19 +4,6 @@
 ###   create_users
 ###   update_deployment
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ inventory_hostname }}"
   include_role:
     name: _digitalocean
@@ -92,16 +79,3 @@
     chdir: '{{ service_base_path }}/{{ inventory_hostname }}'
   tags:
     - update_deployment
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/import-maria-database/tasks/main.yml b/roles/import-maria-database/tasks/main.yml
index afcd4f7..860301e 100644
--- a/roles/import-maria-database/tasks/main.yml
+++ b/roles/import-maria-database/tasks/main.yml
@@ -1,17 +1,6 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages # TODO: Message Refactor :')
+### tags:
 
 - name: "Destroy {{ target_database }}"
   community.mysql.mysql_db:
@@ -27,16 +16,3 @@
     target: "/tmp/{{ uploaded_file }}"
     config_file: "/etc/mysql/mariadb.conf.d/50-client.cnf"
     login_password: "{{ mysql_root_password }}"
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages # TODO: Message Refactor :')
diff --git a/roles/keycloak-postgres/tasks/main.yml b/roles/keycloak-postgres/tasks/main.yml
index 381e4e9..334cbeb 100644
--- a/roles/keycloak-postgres/tasks/main.yml
+++ b/roles/keycloak-postgres/tasks/main.yml
@@ -1,35 +1,8 @@
 ---
 
 ### tags:
-###   update_deployment
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
 
 - name: "Setup postgres for {{ inventory_hostname }}"
   include_role:
     name: postgres
     tasks_from: _postgres-acls
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index b576e17..3afab63 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -6,19 +6,6 @@
 ###   update_realms
 ###   update_deployment
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ inventory_hostname }}"
   include_role:
     name: _digitalocean
@@ -133,16 +120,3 @@
   tags:
     - create_groups
     - update_realms
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
\ No newline at end of file
diff --git a/roles/management-connect-postgres/tasks/main.yml b/roles/management-connect-postgres/tasks/main.yml
index df8ec36..334cbeb 100644
--- a/roles/management-connect-postgres/tasks/main.yml
+++ b/roles/management-connect-postgres/tasks/main.yml
@@ -1,32 +1,8 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: "Setup postgres for {{ inventory_hostname }}"
   include_role:
     name: postgres
     tasks_from: _postgres-acls
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/maria/tasks/_create-database.yml b/roles/maria/tasks/_create-database.yml
index 5ee2130..c787f5a 100644
--- a/roles/maria/tasks/_create-database.yml
+++ b/roles/maria/tasks/_create-database.yml
@@ -1,18 +1,5 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: Ensure MySQL databases are present.
   community.mysql.mysql_db:
     name: "{{ item.name }}"
@@ -35,16 +22,3 @@
     login_password: "{{ mysql_root_password }}"
     host: "{{ item.host }}"
   with_items: "{{ mysql_users }}"
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/maria/tasks/main.yml b/roles/maria/tasks/main.yml
index 913d293..e1464c8 100644
--- a/roles/maria/tasks/main.yml
+++ b/roles/maria/tasks/main.yml
@@ -1,17 +1,6 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: Update
   apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
@@ -108,16 +97,3 @@
     name: prometheus-mysqld-exporter
     state: started
     enabled: yes
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/node-exporter/tasks/main.yml b/roles/node-exporter/tasks/main.yml
index 6e5d3fd..dffe501 100644
--- a/roles/node-exporter/tasks/main.yml
+++ b/roles/node-exporter/tasks/main.yml
@@ -1,17 +1,6 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: "Check if node-exporter/docker-compose.yml exists - TODO: remove after running setup.yml on all hosts .."
   stat:
@@ -47,16 +36,3 @@
   service:
     name: prometheus-node-exporter
     state: restarted
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/pgadmin4/tasks/main.yml b/roles/pgadmin4/tasks/main.yml
index a53510f..b7b5804 100644
--- a/roles/pgadmin4/tasks/main.yml
+++ b/roles/pgadmin4/tasks/main.yml
@@ -1,74 +1,71 @@
 ---
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
+###   update_config
+###   update_deployment
 
-- name: "Check if pgadmin4/docker-compose.yml exists"
+- name: "Setup DNS configuration for {{ inventory_hostname }} pgadmin4"
+  include_role:
+    name: _digitalocean
+    tasks_from: domain
+  vars:
+    record_data: "{{ stage_server_ip }}"
+    record_name: "{{ inventory_hostname }}-pgadmin4"
+
+- name: "Check if {{ inventory_hostname }}/docker-compose.yml exists"
   stat:
-    path: '{{ service_base_path }}/pgadmin4/docker-compose.yml'
+    path: '{{ service_base_path }}/{{ inventory_hostname }}/docker-compose.yml'
   register: check_docker_compose_file
+  tags:
+    - update_config
+    - update_deployment
 
-- name: "Stop pgadmin4"
+- name: "Stop {{ inventory_hostname }}"
   shell: docker-compose down
   args:
-    chdir: '{{ service_base_path }}/pgadmin4'
+    chdir: '{{ service_base_path }}/{{ inventory_hostname }}'
   when: check_docker_compose_file.stat.exists
   ignore_errors: yes
+  tags:
+    - update_deployment
 
-- name: "Deploy docker templates for pgadmin4"
+- name: "Deploy docker templates for {{ inventory_hostname }}"
   include_role:
     name: _deploy
     tasks_from: templates
   vars:
     current_config: "_docker"
     current_base_path: "{{ service_base_path }}"
-    current_destination: "pgadmin4"
+    current_destination: "{{ inventory_hostname }}"
     current_owner: "{{ docker_owner }}"
     current_group: "{{ docker_group }}"
     current_docker: "{{ pgadmin4_docker }}"
+  tags:
+    - update_config
 
-- name: "Deploy service templates for pgadmin4"
+- name: "Deploy service templates for {{ inventory_hostname }}"
   include_role:
     name: _deploy
     tasks_from: templates
   vars:
     current_config: "pgadmin4"
     current_base_path: "{{ service_base_path }}"
-    current_destination: "pgadmin4"
+    current_destination: "{{ inventory_hostname }}"
     current_owner: "{{ docker_owner }}"
     current_group: "{{ docker_group }}"
+  tags:
+    - update_config
 
-- name: "Update pgadmin4"
+- name: "Update {{ inventory_hostname }}"
   shell: docker-compose pull
   args:
-    chdir: '{{ service_base_path }}/pgadmin4'
+    chdir: '{{ service_base_path }}/{{ inventory_hostname }}'
   tags:
     - update_deployment
 
-- name: "Start pgadmin4"
-  shell: docker-compose up -d
+- name: "Start {{ inventory_hostname }}"
+  shell: |
+    docker-compose down
+    docker-compose up -d
   args:
-    chdir: '{{ service_base_path }}/pgadmin4'
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+    chdir: '{{ service_base_path }}/{{ inventory_hostname }}'
diff --git a/roles/pgadmin4/vars/main.yml b/roles/pgadmin4/vars/main.yml
index b4ad884..5b16609 100644
--- a/roles/pgadmin4/vars/main.yml
+++ b/roles/pgadmin4/vars/main.yml
@@ -26,7 +26,7 @@ pgadmin4_docker: {
       labels: [
         '"traefik.enable=true"',   
         '"traefik.http.routers.{{ pgadmin_id }}.service={{ pgadmin_id }}"',
-        '"traefik.http.routers.{{ pgadmin_id }}.rule=Host(`{{ stage_server_domain }}`)"',
+        '"traefik.http.routers.{{ pgadmin_id }}.rule=Host(`{{ inventory_hostname }}-pgadmin4.{{ domain }}`)"',
         '"traefik.http.routers.{{ pgadmin_id }}.entrypoints=websecure"',
         '"traefik.http.routers.{{ pgadmin_id }}.tls=true"',
         '"traefik.http.routers.{{ pgadmin_id }}.tls.certresolver=letsencrypt"',
diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml
index 69aac5d..f3d2add 100644
--- a/roles/postfix/tasks/main.yml
+++ b/roles/postfix/tasks/main.yml
@@ -1,5 +1,22 @@
-# tasks file
 ---
+
+### tags:
+###   configuration
+###   postfix
+###   postfix-facts
+###   postfix-install
+###   postfix-mailname
+###   postfix-configuration
+###   postfix-sasl-passwd
+###   postfix-aliases
+###   postfix-virtual-aliases
+###   postfix-sender-canonical-maps
+###   postfix-transport-maps
+###   postfix-sender-dependent-relayhost-maps
+###   postfix-generic-table
+###   postfix-header-checks-table
+###   postfix-start-enable-service
+
 - name: facts | set
   set_fact:
     is_docker_guest: "{{ ansible_virtualization_role | default('host') == 'guest' and ansible_virtualization_type | default('none') == 'docker' }}"
diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index 38ee488..6ac3848 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -1,5 +1,7 @@
 ---
 
+### tags:
+
 # Minimal requirements for postgres
 - name: Include Base Requirements
   include_tasks: base-requirements.yml
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index 2b9f3cb..7aaec01 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -4,19 +4,6 @@
 ###   update_config
 ###   update_deployment
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
-
 - name: "Setup DNS configuration for {{ inventory_hostname }} prometheus"
   include_role:
     name: _digitalocean
@@ -198,21 +185,8 @@
   loop:
      - {
       name: "{{ grafana_user_smardigo_login }}",
-      email: "smardigo@netgo.de",
       login: "{{ grafana_user_smardigo_login }}",
-      password: "{{ grafana_user_smardigo_password }}"
+      password: "{{ grafana_user_smardigo_password }}",
+      email: "smardigo@netgo.de"
      }
   when: grafana_stats.json.users == 1
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml
index 8a04124..1cc529a 100644
--- a/roles/traefik/tasks/main.yml
+++ b/roles/traefik/tasks/main.yml
@@ -1,17 +1,6 @@
 ---
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: "Check if traefik/docker-compose.yml exists"
   stat:
@@ -68,16 +57,3 @@
   shell: docker-compose up -d
   args:
     chdir: '{{ service_base_path }}/traefik'
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/upload-local-file/tasks/main.yml b/roles/upload-local-file/tasks/main.yml
index 301b885..b77b9ad 100644
--- a/roles/upload-local-file/tasks/main.yml
+++ b/roles/upload-local-file/tasks/main.yml
@@ -1,33 +1,9 @@
 ---
 
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages # TODO: Message Refactor :')
+### tags:
 
 - name: "Copy file to remote locations {{ upload_directory }}/{{ upload_file | basename }}"
   copy:
     src: "{{ upload_file }}"
     dest: "{{ upload_directory }}/{{ upload_file | basename }}"
     mode: 0644
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages # TODO: Message Refactor :')
diff --git a/roles/webdav-postgres/tasks/main.yml b/roles/webdav-postgres/tasks/main.yml
index 381e4e9..334cbeb 100644
--- a/roles/webdav-postgres/tasks/main.yml
+++ b/roles/webdav-postgres/tasks/main.yml
@@ -1,35 +1,8 @@
 ---
 
 ### tags:
-###   update_deployment
-
-- name: "Send mattermost message"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
 
 - name: "Setup postgres for {{ inventory_hostname }}"
   include_role:
     name: postgres
     tasks_from: _postgres-acls
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/roles/webdav/tasks/main.yaml b/roles/webdav/tasks/main.yaml
index 896ad4d..d024270 100644
--- a/roles/webdav/tasks/main.yaml
+++ b/roles/webdav/tasks/main.yaml
@@ -1,17 +1,6 @@
 ---
 
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-start.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
+### tags:
 
 - name: "Check if webdav/docker-compose.yml exists"
   stat:
@@ -59,16 +48,3 @@
   shell: docker-compose up -d
   args:
     chdir: '{{ service_base_path }}/{{ inventory_hostname }}'
-
-- name: "Send mattermost messsge"
-  uri:
-    url: "{{ mattermost_hook_smardigo }}"
-    method: POST
-    body: "{{ lookup('template','mattermost-deploy-end.json.j2') }}"
-    body_format: json
-    headers:
-      Content-Type: "application/json"
-  delegate_to: 127.0.0.1
-  become: false
-  when:
-    - send_status_messages
diff --git a/setup.yml b/setup.yml
index bc68c34..2d86b70 100644
--- a/setup.yml
+++ b/setup.yml
@@ -64,20 +64,20 @@
 
     - role: node-exporter
       when:
-        - node_exporter_enabled | default(True)
+        - node_exporter_enabled
       tags:
         - node-exporter
 
     - role: filebeat
       when:
         - docker_enabled
-        - filebeat_enabled | default(True)
+        - filebeat_enabled
       tags:
         - filebeat
 
     - role: traefik
       when:
         - docker_enabled
-        - traefik_enabled | default(True)
+        - traefik_enabled
       tags:
         - traefik