diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index 0fe2871..14df760 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -135,9 +135,6 @@ logstash_certificate: "{{ stage }}-elastic-stack-logstash-01"
 #grafana_user_guest_login: "< see vault >"
 #grafana_user_guest_password: "< see vault >"
 
-#harbor_admin_password: "< see vault >"
-#harbor_postgresql_password: "< see vault >"
-
 #vault_ansible_password: "< see vault >"
 #vault_replicator_user_password: "< see vault >"
 
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
index 1b595ed..0607b91 100644
--- a/group_vars/all/vault.yml
+++ b/group_vars/all/vault.yml
@@ -1,67 +1,60 @@
 $ANSIBLE_VAULT;1.1;AES256
-37393966613635643437356166643332323034373138656131333866376465623239373036396137
-6130313562653266303766363038616533336461386639640a633562636636626564623263323861
-35323233393361666163666435303161616134653631353563613536373630643932303130373066
-6139373738313162650a323332306537343066363332616234336332653737666636303134373863
-66326130616138366539353761376361323663396534633566656463323332313731386230313561
-30396131366539323465396664616361323965343566383739373066376630303766346366363063
-35396631313465656464336466333663353537333562386435386634326334376663353735393630
-38353235393239633337313239323763626362396131333061626431306163323032353833613062
-38646561336634366164393237336437636265343934313633663133663832623837303239376664
-63643865396537313434333735393033333364656330343035386335336661323237646332653134
-39323961633065363365613431326161363663356433646361636163643738313334343232646138
-63356235336566663531373630316635666336623937666432373731646663306466326365383636
-32643065393630323062313630343232653038396565643661333630366438653831303439313030
-32346661666463626565623936303433393762346562633965356465666432376236396263336163
-36396134653139343530303364613937383035383363613133346637316630373730643138356432
-39666330333234663935356537666631393437343533386230316336356636643831663336393431
-37666464393061313736653265346535343065373731633831333032646130336335643236383331
-30353530343664366231373338643938386464373064373563623062383631313734363238373561
-33323562356630663662663831656533616264623561643930306439336666653932343433356132
-32386361363632363238323864333139383561323535326264386632386563613064623531376636
-37386533346331346463633339333038656237366539303638643464313533646165376238613561
-32376665653535643338363832393832613266306231303335646132663135373833616263373962
-35363934303764643933616537393436306565643661623862306336623361373134383061323130
-35393461623831353239616539613431376533363165326562383264323137376266356330333361
-32346130656539373961653935313266343438303432346266306563353139323466646339363463
-35383034333638353037306462353461376236623664636537366662313334313734343434336135
-37643730366138663039616331343162653734616233653662306330333630653735626263653636
-39366131623434306534633531383834643562373464666533343231323531646466396239386561
-66313939343361623761633630636435396461666133326663373964633761353333316633633135
-62353632613166373839613838616338633038633836623839333233306664323637353665343364
-62343437626261653138663936303365383836333166633731346438336663353137646666616433
-30383566666362613430653965623762346563346134306132666336626666653338376639336232
-62343931386335326331343637633331326639363664653239666264633533623765643366633534
-66636635316565366633653164396564656330373635363632646630303435376565306638303036
-34326465333738323537313063356333663536613635303537653863316231363538393733663438
-39656537373039316561313632356434323037656236346463646332316666646164356331393139
-34666631396537633666633434643463626262353662653337626461663562343633306364613265
-33323732396130643864326236363739636539323131633061303863323763633339373432366263
-32346366643334653538316130306633363463623361333065396530643962306233646434636661
-36666637313635306233346436323337346361366638373135313933643861303138363236376261
-62366634333639616463383235373864653232333632323563346261326435386234376664373666
-34336338616434613539636361336466346137323038313931323632653966376136326436373462
-33316562383764336264333836336330333436383836353831386136326335363535383761646564
-39333238613736393661386663636633306462633630386232636134623032353164373835303666
-31316235363631303737313037636161366431313033303833316238373638613430316338316137
-34646434393165376661613134633530323831656537303030316436646661303563346562326338
-31636237313339373661306239363334313461663637393432636534376537366437333035353765
-37336533393834633538363764613465643164663236626630646438373137306633326236303465
-35383235616462356166613037363130356333653462313663313763393130303663396131343239
-36383134636631653262386536333136366263383139383566393131356465303562376232643530
-36653734313063643264323139363565396537336531656234333234303537333535383566386630
-65633663313666636535336237663165316664393866623336343563646134366133303638383436
-36393837636661313635316466366465386231343735393732666239666139353831633130386461
-30393664313164316365343734363134663964356166306538653835303562306534663066653261
-38343032353036373766313664313834386266363338393036363862616338376534383563373163
-31656262323938616162326565353632613832303861343335633765376332623737616130383762
-66336233316665346362313130626632373962643139376366653632663832643332316531326634
-63336565633532303765366631316637393962653735373630616433306437613231383461633063
-61356262633639383361663239333365643839346263666261336333343465363734396265633037
-31663338306666656365383334623566306265356234386331373833656231303266616162616539
-30363132326465663962376137333636313839346639353539383962336538646666366337643137
-33373538663139313432313832623064386366386364343037666530353731373464316565393839
-32353633303264386634326466333035613934303863336361636666633835363063643961363533
-37393035613865343366656131333037383732363031333339663930616365626333333865653166
-37343233613365643362656563633830396364386530373330656639653366383962333761333831
-3133653563623432346636393634363563623166373435386164
+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
diff --git a/group_vars/keycloak/plain.yml b/group_vars/keycloak/plain.yml
index f5ea771..27d9169 100644
--- a/group_vars/keycloak/plain.yml
+++ b/group_vars/keycloak/plain.yml
@@ -20,7 +20,7 @@ keycloak: {
         {
           "username": "docker-admin",
           "password": "docker-admin",
-          "email": "docker-admin@smardigo.digital",
+          "email": "docker@smardigo.digital",
         }
       ],
       groups: [
@@ -28,59 +28,60 @@ keycloak: {
           "name": "admin",
         },
         {
-          "name": "awx",
+          "name": "smardigo",
         },
         {
           "name": "sensw",
         },
         {
-          "name": "smardigo",
+          "name": "ssp",
         },
         {
-          "name": "ssp",
+          "name": "awx",
         },
       ],
       clients: [
         {
-          clientId: 'dev-docker-registry-01',
-          name: 'dev-docker-registry-01',
+          clientId: '{{ docker_registry_oidc_client_id }}',
+          name: '{{ docker_registry_oidc_client_id }}',
           admin_url: '',
           root_url: '',
           redirect_uris: '
             [
-              "https://dev-docker-registry-01.smardigo.digital/*",
+              "https://{{ stage }}-docker-registry-01.{{ domain }}/*",
             ]',
-          secret: 'f1f852b4-2e75-448a-9596-3c77d53ce405',
+          secret: '{{ docker_registry_oidc_client_secret }}',
           web_origins: '
             [
-              "https://dev-docker-registry-01.smardigo.digital",
+              "https://{{ stage }}-docker-registry-01.{{ domain }}",
             ]',
         }
       ]
     },
     {
-      name: 'smardigo',
-      display_name: 'smardigo',
+      name: '{{ smardigo_management_oidc_realm }}',
+      display_name: '{{ smardigo_management_oidc_realm }}',
       users: [
         {
           "username": "connect-admin",
           "password": "connect-admin",
+          "email": "connect@smardigo.digital",
         }
       ],
       clients: [
         {
-          clientId: 'management-smardigo',
-          name: 'management-smardigo',
+          clientId: '{{ smardigo_management_oidc_client_id }}',
+          name: '{{ smardigo_management_oidc_client_id }}',
           admin_url: '',
           root_url: '',
           redirect_uris: '
             [
-              "https://dev-management-smardigo-01-connect.smardigo.digital/*",
+              "https://{{ stage }}-management-smardigo-01-connect.{{ domain }}/*",
             ]',
-          secret: 'f1f852b4-2e75-889a-2453-3c55d53ce405',
+          secret: '{{ smardigo_management_oidc_client_secret }}',
           web_origins: '
             [
-              "https://dev-management-smardigo-01-connect.smardigo.digital",
+              "https://{{ stage }}-management-smardigo-01-connect.{{ domain }}",
             ]',
         }
       ]
diff --git a/host_vars/dev-mail-01.yml b/group_vars/postfix/plain.yml
similarity index 88%
rename from host_vars/dev-mail-01.yml
rename to group_vars/postfix/plain.yml
index a5436ca..5b8a800 100644
--- a/host_vars/dev-mail-01.yml
+++ b/group_vars/postfix/plain.yml
@@ -2,6 +2,10 @@
 
 hetzner_server_labels: "stage={{ stage }} service=mail"
 
+docker_enabled: false
+traefik_enabled: false
+filebeat_enabled: false
+
 postfix_mynetworks:
   - '127.0.0.0/8' # default
   - '[::ffff:127.0.0.0]/104' # default
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 7f99d81..914d210 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -19,7 +19,6 @@ shared_service_webdav_ip: "10.0.0.16"
 
 shared_service_maria_hostname: "dev-maria-01"
 shared_service_postgres_01_hostname: "dev-postgres-01"
-shared_service_postgres_02_hostname: "dev-postgres-02"
 shared_service_elastic_stack_01_hostname: "{{ stage }}-elastic-stack-elastic-01"
 shared_service_elastic_stack_02_hostname: "{{ stage }}-elastic-stack-elastic-02"
 shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03"
@@ -93,12 +92,22 @@ elastic_stack_network: {
   dev-elastic-stack-elastic-03: "{{ shared_service_elastic_03 }}",
 }
 
-awx_admin_username: "awx-admin"
-awx_admin_password: "awx-admin"
+docker_registry_oidc_realm: "docker"
+docker_registry_oidc_client_id: "docker-registry"
+
+smardigo_management_oidc_realm: "smardigo"
+smardigo_management_oidc_client_id: "management-smardigo"
 
 smardigo_management_url: "{{ http_s }}://{{ management_service_connect_hostname }}/api/v1/scopes/{{ scope_id }}/processes/{{ process_instance_id }}/messages"
 smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCRO1cVFgkyZ45D5cJNK5g.fc6JVOo5ja5sqe-0PQTfJGOivJ6tyiD-rwgY6rXJ3-U.tOgqgJ2zTjB3_M9BGtvVjQ"
 
+#awx_admin_username: "< see vault >"
+#awx_admin_password: "< see vault >"
+
+#harbor_admin_username: "< see vault >"
+#harbor_admin_password: "< see vault >"
+#harbor_postgresql_password: "< see vault >"
+
 #docker_registry_username: "< see vault >"
 #docker_registry_token: "< see vault >"
 
@@ -106,3 +115,6 @@ smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCR
 #elastic_admin_password: "< see vault >"
 
 #netgo_msteams_hook_alerting: "< see vault >"
+
+#docker_registry_oidc_client_secret: "< see vault >"
+#smardigo_management_oidc_client_secret: "< see vault >"
diff --git a/group_vars/stage_dev/vault.yml b/group_vars/stage_dev/vault.yml
index 8d6c6e9..9dfbcdd 100644
--- a/group_vars/stage_dev/vault.yml
+++ b/group_vars/stage_dev/vault.yml
@@ -1,26 +1,44 @@
 $ANSIBLE_VAULT;1.1;AES256
-39663735663765343234386361666137316564303931653335656533333632396565343330303666
-6564613136643761663734633864663666333232333739360a653362366161663935316438333565
-35336330623134396436373462336334656131343830323732323132616463623836636637386130
-3938386430306564310a383363323639316432373163653766333764313865343835393632353264
-37623362316664336563393731383562313730386434353939333937323935653539666435336537
-36316536363663353739323838336632353761373230376235303633656630613166323161643164
-36663464383666663130633361376562383362613837303330343033376362636236663137353361
-34383364646531643565323931313263633536323132313930373264386561656530353863653633
-31613134353539383931333430353830303463353931666530386337333763653565353531663239
-65663431386362643033313634326433396634333933646230353538303766646662353138393062
-30393636616637383233666636653465393537633366646462303165633435376335306564646536
-35303039393264353339616533343663623765333461653132306466323464653436623032396664
-39353765363163353563646339663037393436373437643233373461373066383664396366613033
-63373431326663303634383564373564363539346437336635343534326466323732313964353436
-36326263646261656439313138646662316630656139626461386361373331643438623435653336
-37643432666665633630393130313731623632613564643462616261316534303135306336636664
-33333838633739323330613233376437346631323564343631633539316365306336313530366562
-38626137323661666365633838306337633266623133343132616635623233353861373739373531
-34666663653236313835343236393139623865626265646437646462313730343565363663333034
-64376162313664616363373336636338373634633032323663336133616535636437616436656336
-32363638663861376565306362666662663464613364363334363139613433643639376132303165
-34373838366264323466633636373539353364636662636531613863613664303136633661643332
-64303961636464393434316539626361383534376130653331623762376265356561643939643461
-32623938306661656130383733363062653932666532633430393637386262303434656362393066
-3136
+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
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index 9543fc9..86bd87b 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -4,17 +4,63 @@ stage: "qa"
 
 # TODO read configuration with hetzner rest api
 shared_service_network: "10.1.0.0/16"
-shared_service_elastic_01: "10.1.0.2"
-shared_service_elastic_02: "10.1.0.3"
-shared_service_elastic_03: "10.1.0.4"
-shared_service_logstash_01: "10.1.0.7"
+shared_service_elastic_01: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-elastic-stack-elastic-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_elastic_02: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-elastic-stack-elastic-02' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_elastic_03: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-elastic-stack-elastic-03' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_logstash_01: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-elastic-stack-logstash-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_mail_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-mail-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_pg_master_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-postgres-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_pg_slave_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-postgres-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_maria_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-maria-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
+shared_service_keycloak_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-keycloak-01' )
+  | map(attribute='private_ip')
+  | list
+  | first }}"
 
+shared_service_maria_hostname: "dev-maria-01"
+shared_service_postgres_01_hostname: "{{ stage }}-postgres-01"
 shared_service_elastic_stack_01_hostname: "{{ stage }}-elastic-stack-elastic-01"
 shared_service_elastic_stack_02_hostname: "{{ stage }}-elastic-stack-elastic-02"
 shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03"
 shared_service_elastic_stack_logstash_01_hostname: "{{ stage }}-elastic-stack-logstash-01"
 
-shared_service_docker_registry_hostname: "{{ stage }}-docker-registry-01.smardigo.digital"
+shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}"
+shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
+
+shared_service_docker_registry_hostname: "{{ stage }}-docker-registry-01.{{ domain }}"
 
 shared_service_hosts: [
   {
@@ -36,7 +82,23 @@ shared_service_hosts: [
   {
     ip: "{{ shared_service_logstash_01 }}",
     name: "{{ shared_service_elastic_stack_logstash_01_hostname }}"
-  }
+  },
+  {
+    ip: "{{ shared_service_maria_ip }}",
+    name: "{{ shared_service_maria_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_pg_master_ip }}",
+    name: "{{ shared_service_postgres_01_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_mail_ip }}",
+    name: "{{ shared_service_mail_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_keycloak_ip }}",
+    name: "{{ shared_service_keycloak_hostname }}"
+  },
 ]
 
 # TODO read configuration with hetzner rest api
@@ -46,6 +108,22 @@ elastic_stack_network: {
   qa-elastic-stack-elastic-03: "{{ shared_service_elastic_03 }}",
 }
 
+docker_registry_oidc_realm: "docker"
+docker_registry_oidc_client_id: "docker-registry"
+
+smardigo_management_oidc_realm: "smardigo"
+smardigo_management_oidc_client_id: "management-smardigo"
+
+smardigo_management_url: "{{ http_s }}://{{ management_service_connect_hostname }}/api/v1/scopes/{{ scope_id }}/processes/{{ process_instance_id }}/messages"
+smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCRO1cVFgkyZ45D5cJNK5g.fc6JVOo5ja5sqe-0PQTfJGOivJ6tyiD-rwgY6rXJ3-U.tOgqgJ2zTjB3_M9BGtvVjQ"
+
+#awx_admin_username: "< see vault >"
+#awx_admin_password: "< see vault >"
+
+#harbor_admin_username: "< see vault >"
+#harbor_admin_password: "< see vault >"
+#harbor_postgresql_password: "< see vault >"
+
 #docker_registry_username: "< see vault >"
 #docker_registry_token: "< see vault >"
 
@@ -53,3 +131,6 @@ elastic_stack_network: {
 #elastic_admin_password: "< see vault >"
 
 #netgo_msteams_hook_alerting: "< see vault >"
+
+#docker_registry_oidc_client_secret: "< see vault >"
+#smardigo_management_oidc_client_secret: "< see vault >"
diff --git a/group_vars/stage_qa/vault.yml b/group_vars/stage_qa/vault.yml
index afdac6d..d354502 100644
--- a/group_vars/stage_qa/vault.yml
+++ b/group_vars/stage_qa/vault.yml
@@ -1,24 +1,44 @@
 $ANSIBLE_VAULT;1.1;AES256
-36376662313162386465376234643830626266343664636263396361306166326164653137373265
-6164316438613363393965306262346139313336306662640a333737313364636664326238333865
-63393137373861376238326239636535666635633864383065346366396663646634646464353238
-3163366538656439650a356139616363346337373738303135316131306562666262656164376333
-35353632663965363634326363353637623461663761623339303435396566636432336638333535
-35646230653035303939343132336430356663366234306630633938653739376538616339663736
-38363139663062363036356265653434626261323132316130313236383934326231343866336634
-38373530366236666339366364663531323630656131393432366666636164643335623862656337
-65323735396435353131393564386539383736386265616365353439323462636533363631616432
-61653236613066393439653938363366323338326330303735613337386437343365386465386132
-63633238643437646137646534653364343861336237346133353433613930323639383632343233
-33313462636539356130623266336639613663323462336664636431636364633831326531356635
-38373663313935313134386436303335306231303233613765663534643965653264396234636638
-39643632323564326333313239343634653735383233616331646334343161353535393064303862
-38363065646333636562633266353464316266376538313665383437643931356232336562376633
-63376235383536386536623737366436353538636538623036373763363866356632326135363063
-37306139633536363562383032316665363038323538386236623763633364303066323066386634
-61653432363935646133346265636237316134376536356431346465366137633136643436343835
-64653963616261653364376437393062383865313662366531616333306466656234373232373330
-30643537613764633662646362326634633061663035373432646535666237613637343937326139
-62353763316466646432366162323137646337333630663133393036323865633531626161326136
-35396664323339343266396563626665353939363063643965383138333830323464626466663334
-306631343266396430646664373939663064
+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
diff --git a/host_vars/dev-management-smardigo-01.yml b/host_vars/dev-management-smardigo-01.yml
index a7b701d..82a10f9 100644
--- a/host_vars/dev-management-smardigo-01.yml
+++ b/host_vars/dev-management-smardigo-01.yml
@@ -5,7 +5,7 @@ hetzner_server_type: cpx21
 connect_elastic_prefix: "dev_management_smardigo_connect"
 connect_postgres_database: "dev_management_smardigo_connect"
 
-current_realm_name: "smardigo"
-cluster_name: "management-smardigo"
-connect_oidc_client_secret: "f1f852b4-2e75-889a-2453-3c55d53ce405"
-spring_profiles_include: "prod,postgres,elastic,swagger"
\ No newline at end of file
+current_realm_name: "{{ smardigo_management_oidc_realm }}"
+cluster_name: "{{ smardigo_management_oidc_client_id }}"
+connect_oidc_client_secret: "{{ smardigo_management_oidc_client_secret }}"
+spring_profiles_include: "prod,postgres,elastic,swagger"
diff --git a/host_vars/qa-management-smardigo-01.yml b/host_vars/qa-management-smardigo-01.yml
new file mode 100644
index 0000000..e38012f
--- /dev/null
+++ b/host_vars/qa-management-smardigo-01.yml
@@ -0,0 +1,11 @@
+---
+
+hetzner_server_type: cpx21
+
+connect_elastic_prefix: "qa_management_smardigo_connect"
+connect_postgres_database: "qa_management_smardigo_connect"
+
+current_realm_name: "{{ smardigo_management_oidc_realm }}"
+cluster_name: "{{ smardigo_management_oidc_client_id }}"
+connect_oidc_client_secret: "{{ smardigo_management_oidc_client_secret }}"
+spring_profiles_include: "prod,postgres,elastic,swagger"
diff --git a/host_vars/qa-postgres-01.yml b/host_vars/qa-postgres-01.yml
new file mode 100644
index 0000000..ae5d8f1
--- /dev/null
+++ b/host_vars/qa-postgres-01.yml
@@ -0,0 +1,3 @@
+---
+
+server_type: "master"
diff --git a/host_vars/qa-postgres-02.yml b/host_vars/qa-postgres-02.yml
new file mode 100644
index 0000000..39e2488
--- /dev/null
+++ b/host_vars/qa-postgres-02.yml
@@ -0,0 +1,3 @@
+---
+
+server_type: "slave"
diff --git a/roles/harbor/defaults/main.yml b/roles/harbor/defaults/main.yml
index 46909b2..f2f0d02 100644
--- a/roles/harbor/defaults/main.yml
+++ b/roles/harbor/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 
-harbor_version: v2.2.2
+harbor_version: v2.3.0
diff --git a/setup.yml b/setup.yml
index 48ac605..bc68c34 100644
--- a/setup.yml
+++ b/setup.yml
@@ -17,6 +17,14 @@
         - common
         - pgadmin4
 
+    - name: Updating apt cache
+      apt:
+        update_cache: yes
+      when: ansible_distribution == "Ubuntu"
+      tags:
+        - common
+        - install
+
     - name: Remove outdated dependencies
       apt:
         name: [
@@ -47,29 +55,29 @@
         docker_compose_version: '1.29.1'
         docker_compose_path: '/usr/bin/docker-compose'
         docker_users: '{{ smardigo_plattform_users }}'
+      when:
+        - docker_enabled
 
     - role: common
       tags:
         - common
 
-    - role: filebeat
-      when: filebeat_enabled | default(True)
-      tags:
-        - filebeat
-
     - role: node-exporter
-      when: node_exporter_enabled | default(True)
+      when:
+        - node_exporter_enabled | default(True)
       tags:
         - node-exporter
 
+    - role: filebeat
+      when:
+        - docker_enabled
+        - filebeat_enabled | default(True)
+      tags:
+        - filebeat
+
     - role: traefik
       when:
         - docker_enabled
         - traefik_enabled | default(True)
       tags:
         - traefik
-
-    - role: pgadmin4
-      when: pgadmin4_enabled | default(False)
-      tags:
-        - pgadmin4
diff --git a/stage-qa b/stage-qa
index 6816c9f..9bf67fe 100644
--- a/stage-qa
+++ b/stage-qa
@@ -8,10 +8,12 @@ qa-elastic-stack-elastic-02
 qa-elastic-stack-elastic-03
 
 [harbor]
+qa-docker-registry-01
 
 [iam]
 
 [keycloak]
+qa-keycloak-01
 
 [kibana]
 qa-elastic-stack-kibana-01
@@ -20,10 +22,14 @@ qa-elastic-stack-kibana-01
 qa-elastic-stack-logstash-01
 
 [maria]
+qa-maria-01
 
 [postfix]
+qa-mail-01
 
 [postgres]
+qa-postgres-01
+qa-postgres-02
 
 [prometheus]
 qa-prometheus-01
diff --git a/templates/harbor/harbor/harbor.yml.j2 b/templates/harbor/harbor/harbor.yml.j2
index 32f30e5..269e4d2 100644
--- a/templates/harbor/harbor/harbor.yml.j2
+++ b/templates/harbor/harbor/harbor.yml.j2
@@ -2,7 +2,7 @@
 
 # The IP address or hostname to access admin UI and registry service.
 # DO NOT use localhost or 127.0.0.1, because Harbor needs to be accessed by external clients.
-hostname: dev-docker-registry-01.smardigo.digital
+hostname: {{ stage }}-docker-registry-01.{{ domain }}
 
 # http related config
 http:
@@ -15,8 +15,8 @@ https:
   # https port for harbor, default is 443
   #port: 443
   # The path of cert and key files for nginx
-  #certificate: /etc/smardigo/harbor/smardigo.digital.cert
-  #private_key: /etc/smardigo/harbor/smardigo.digital.key
+  #certificate: /etc/smardigo/harbor/{{ domain }}.cert
+  #private_key: /etc/smardigo/harbor/{{ domain }}.key
 
 # internal_tls:
 #   # set enabled to true means internal tls is enabled
@@ -26,12 +26,12 @@ https:
 
 # Uncomment external_url if you want to enable external proxy
 # And when it enabled the hostname will no longer used
-external_url: https://dev-docker-registry-01.smardigo.digital
+external_url: https://{{ stage }}-docker-registry-01.{{ domain }}
 
 # The initial password of Harbor admin
 # It only works in first time to install harbor
 # Remember Change the admin password from UI after launching Harbor.
-harbor_admin_password: fhbp937zefh45
+harbor_admin_password: {{ harbor_admin_password }}
 
 # Harbor DB configuration
 database: