diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index b8066c3..82db115 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -83,6 +83,7 @@ docker_compose_path: "/usr/bin/docker-compose"
 service_base_path: '/etc/smardigo'
 
 # TODO we need a company email addresses
+gitea_admin_email: "sven.ketelsen@netgo.de"
 lets_encrypt_email: "sven.ketelsen@netgo.de"
 docker_admin_email: "sven.ketelsen@netgo.de"
 connect_admin_email: "sven.ketelsen@netgo.de"
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index b0a59af..0a45ace 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -8,97 +8,116 @@ shared_service_elastic_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_elastic_02: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_elastic_03: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-03' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_logstash_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-logstash-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_docker_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-docker-registry-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_mail_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-mail-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_pg_master_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-postgres-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_pg_slave_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-postgres-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_maria_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-maria-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_keycloak_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-keycloak-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_iam_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-iam-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_webdav_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-webdav-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_gitea_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-gitea-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_master_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-master-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_master_02: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-master-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_master_03: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-master-03' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_node_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-node-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_node_02: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-node-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_kube_node_03: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-kube-node-03' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 
 shared_service_maria_hostname: "{{ stage }}-maria-01"
 shared_service_postgres_01_hostname: "{{ stage }}-postgres-01"
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index 46bdc97..f835cc1 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -8,62 +8,116 @@ shared_service_elastic_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_elastic_02: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_elastic_03: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-elastic-03' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_logstash_01: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-elastic-stack-logstash-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_docker_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-docker-registry-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_mail_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-mail-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_pg_master_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-postgres-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_pg_slave_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-postgres-02' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_maria_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-maria-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_keycloak_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-keycloak-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_iam_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-iam-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
 shared_service_webdav_ip: "{{ stage_server_infos
   | selectattr('name', 'match', stage + '-webdav-01' )
   | map(attribute='private_ip')
   | list
-  | first }}"
+  | first
+  | default('-') }}"
+shared_service_gitea_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-gitea-01' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_master_01: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-master-01' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_master_02: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-master-02' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_master_03: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-master-03' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_node_01: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-node-01' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_node_02: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-node-02' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
+shared_service_kube_node_03: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-kube-node-03' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
 
 shared_service_maria_hostname: "{{ stage }}-maria-01"
 shared_service_postgres_01_hostname: "{{ stage }}-postgres-01"
@@ -72,8 +126,16 @@ 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"
 
+kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain }}"
+kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain }}"
+kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain }}"
+kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain }}"
+kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain }}"
+kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain }}"
+
 shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}"
 shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}"
+shared_service_gitea_hostname: "{{ stage }}-gitea-01.{{ domain }}"
 shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
 shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
 shared_service_docker_registry_hostname: "{{ stage }}-docker-registry-01.{{ domain }}"
@@ -130,6 +192,34 @@ shared_service_hosts: [
   {
     ip: "{{ shared_service_webdav_ip }}",
     name: "{{ shared_service_webdav_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_gitea_ip }}",
+    name: "{{ shared_service_gitea_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_master_01 }}",
+    name: "{{ kube_master_01_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_master_02 }}",
+    name: "{{ kube_master_02_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_master_03 }}",
+    name: "{{ kube_master_03_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_node_01 }}",
+    name: "{{ kube_node_01_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_node_02 }}",
+    name: "{{ kube_node_02_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_node_03 }}",
+    name: "{{ kube_node_03_hostname }}"
   }
 ]
 
@@ -196,6 +286,9 @@ mysql_root_password: "{{ mysql_root_password_vault }}"
 pgadmin4_admin_username: "{{ pgadmin4_admin_username_vault }}"
 pgadmin4_admin_password: "{{ pgadmin4_admin_password_vault }}"
 
+gitea_admin_username: "gitea-admin"
+gitea_admin_password: "{{ gitea_admin_password_vault }}"
+
 netgo_msteams_hook_alerting: "{{ netgo_msteams_hook_alerting_vault }}"
 
 docker_registry_oidc_client_secret: "{{ docker_registry_oidc_client_secret_vault }}"
diff --git a/group_vars/stage_qa/vault.yml b/group_vars/stage_qa/vault.yml
index 214bbde..41aed30 100644
--- a/group_vars/stage_qa/vault.yml
+++ b/group_vars/stage_qa/vault.yml
@@ -1,75 +1,78 @@
 $ANSIBLE_VAULT;1.1;AES256
-37393561386634393939366239333863326264393339313631623965343566363033626637656436
-6532343266353930306138346163373437393061376638340a396539313734316339303361383361
-62336534326331396437633734333064613366313366393032613733633534643038616461633761
-6531653133333833620a353439343263623135623036336166653235393764663961383265386466
-63653631333962383736343465646662346162623362613166646438373163366362346632346631
-64363639356433343339663166646430363066633031396466633661383638613338303539656432
-64343764336232636162613064366532303732663932343532363461353962373936383233643564
-38363734373561363261396431346236303364623636343535353465616665363764356431663731
-37363633653431636162376562383563313638636363656336646530303836646337343934336139
-32396266643830336363643536323963653565656366666365353536376636363332613864626436
-30343732626439646434316337633538303036376663303432376134333738376539303539616364
-31323339633930666266373438623563636263633835326262306539326632363030653230376664
-30663937333831323837656166373339643733653838313766326133613237363237643438383132
-36663266396439613062336237383730363863333033366136386261656431646332373934363839
-65333533313434643738353235383034363863636330636530646537306533303166633236323232
-32366536343461346163326136623866646131333739373531323633346231373539303961663666
-36316530343630626662343236396138326335636534336263383738393234366335313861323866
-66323862623538336130643263306565656261643539343463626437346132353039353962316161
-38333361356162303635326665616532353031656232386636363465363237363636353364326363
-63313436643633393939316539393066323537643930396265643534353836376530366533653335
-31653936343035653164313936346466346165306165636639313863326638353264306331396232
-64636261336163346635383235393334663761353838666236356661396132353637363861633666
-63633432613162313130653335643333653364616261626231343734356133336661623761653462
-62333937616565616231653733623734613538363334343461376464366135303234303662313862
-30393436656131333066616634353736393837383962346166666161626337323865336266333631
-32643439363665663237353738336263393830316662623736363630393031633831373466373431
-35623736376663323361646663323034393239316334663536623963633962376138376437353432
-62663435366237306134333939353139353963373739343439656430303136393261386138343839
-65616334356332633362336436343138333561373661633763626433373437366537393335633834
-31623235626330353435383937303633623830393539393861313539663833326165363466333931
-39323264323430376639313264613335366538323937336338333062303431616561393234363861
-33633035613366366337303765666266373436373261393835346630336434376437316564373761
-64383863353138626232303463623830333336633032356537323936343537316632663336336462
-31396430323138353537353463313731393132333632623161643832653935313239313663383263
-64373164333031653630656333393233323634396436323334326439353265613161653566386265
-64643337303133386632643539343132613966653032616563386133316136373561353034393035
-39313932316562393034646261616633316166393839666435643532313839333361623963313961
-31633836633264396565333333313464653737396235623365623038623636393930383863666166
-35643361646266626438326332663636353036666231633965353138646535343961363764366134
-36623731623230646162333238666531643765376362353962613035633063393439346131626333
-32643332383863306363333437313936303837353933353037393539356165396462366338396134
-39666166316634663061623539333762356537373930616165333262396635666564353262363862
-64313439303735396134663562663934613366383263386330316362663865373435633338663230
-30313337636266333839663533326635656563666661323366383064653437376136613363346537
-62393863363936656239393566633762383131663238663965333765663861383439356465663264
-38393433313663396637373634636564313964393464303439623066623833346436313366303938
-30373136373535356330386161376462613934646338646431633033333530303361383566663364
-63313832636665363139303732303166343266316233393935303236356365376465666438393861
-65306630353265626262346531393632323361393961356335633166623361353630663138343631
-32323863373666356335613461616165343433306161616266643562656262333461343132366336
-39663534333038323566373336383162363439663833656463326535656564373064333066633330
-38613033653934306634333938633035656663396663363530623933376239373736656335333130
-62313662376430623438623430343539333463636338383338343065646235366630633839383664
-62646466383364313263643264623933393366303737393066343134386438306239346332313436
-31613330666363383461656134303034633731363332613665626633373832306563613230356633
-63633131623833326534666363663139376561656133646161663735646638396664643565346230
-61366165363864383462393830303365353466626334666534336261393330663430653638343764
-39376533643563646164663762323461623836653363613465336433663464613466306132383635
-30383064393134656362626166346339336635323166326236316534396133363539393134386631
-63313635323864613235366464326333326663323332316439623634663430376563333037633436
-63306431383236376232646166373365323733343765333266663036386537303532333834343565
-66653637623662656265663338386332323632363336343163363366383162333332396638396163
-64643866313466393430346135646432386361333439373466326635336432613466393830393335
-36393636326362373038613362356166363635333130366335363338613831393239383335366338
-33633136386434636461646234633238343938386233393734626162666434373964623963366230
-31326135373062663038393161313266663935663663643464373232633762656238663339633365
-32653939316562616630653531306635383334633063653964336264643132626261636161666134
-65323034626234313037626338636132316238343231613031386130653265636265623366356537
-38333465363930643933326137306231333338323139303238353132613431306434383337386165
-62326235343962653131356336616263666639613834623430386230633531636462633734396662
-30393633313837383661316236353961323239636364383231656362336632326431643939633761
-33306636646536303330343735333837646362383538323339393162636136613961343635396166
-61616664666363316261613362663163313065663263373036646266393832363435333037333139
-6462653664623966643631653066396363626135353839336131
+30616231633365376266366133663435366235323234623635336139386264666539663335343166
+6439343065353037303030376331616130376461643331370a653964343936356430346363393563
+66393466613561633833396164663534306231653733333264363661303837626466363566323239
+6237666465363066310a656639313436383963306538373364616537633233396237393237396632
+36343534363136633139393736666264323532663838656335653538663639633365623863373038
+33393033616564633465356632316163353831363234643834393264383736393734393333653166
+39633338663730343665323661336633633065646461643836666664666565346536616230656236
+37306563653939333234636162393330393263356366336133353830663764396562656134316632
+64316537353166363235396635376439626463306333323234363366396433326365366232393432
+33396265333438656337393539373734316637663835613439353231613764336662313838633238
+62613838373463333737396139303438333361313530623132623632376662393461613766353633
+64396666396238393639356635356634616661653838643236633438373339333736313461333939
+36613134663765646164356161373336656236326366333836623037656365356461363539343733
+30643439303566383334623339373538633463386336653261356566663562393637366339343134
+34636332373063666462386637333138653163316231316631313065343637356431616235666638
+66363338376236366637396664306130656330623538343837306237636162306434393433303665
+32356634373034303262623339373461663166643335393638623335356630643238343932383063
+64633636356263643531633662323764363261343536633261613231363439643335343335333763
+33656265323530626437633861303533386264366634666661363962633666646263323335366134
+61666664366538386361633938633864653334306363623664316636656531373332343631306537
+62303434353564633766313335646161303564663164346333633137323661616333363132363035
+32643136393263353061393936613034616266383265393161333934613135363162353638396362
+35613334363237663736633430376261336136633435646633353064303436633235366362366437
+65383235623438663365663434343330653434623531303334623839663663613834636166366162
+31303435323533643231616636323739363037663265333562336331613962316331306534383033
+34663966636265656561313938396630666639383665376232633332326632313535663536373462
+36316535643237373333396232346632643164393230646536653437333131656463336136316133
+62353535663235313439636238366132356631663434396235633262306265373464366262393935
+31666361656566363230336664376665633937376266396264396431373837653731396365343135
+66656666356339633964383063613962396538303633383062383261633262366566626235643861
+66346162383336633136613431313538363337376666366632663534636162376630613562356434
+65373964636565643561303232393864646434396336656132363838383638613832666664343136
+66336561653064323739626338393964316138326136333963373864333862323933316165663333
+62343839316637663034303531356332323832373865373964323465383364343661326266333964
+63343134656435636332666237626338613034336437643735366333343734653933353635356564
+34643235363337633764626437636661393766633764323638353331666464313731373166383230
+33653930643836343264666633663337343965336330383634353765633330333433656361663437
+32663835346233363266323132356336303731656431336630376265633031346165653735383230
+37303361313531623237666535663038353233323735386131326239363935323963356435343733
+66663362336661373136333665316466623463376261653036616661353066346137333163343232
+30333132643936616462646534616661623837626166353565646632393963653666343134373562
+66386430626133386536383732323534616134616536643565653335653263626230393961316137
+37386537343839396534383064306331303461633336306630643561643338323066633038383737
+31636163373764633761393261313266333838643336666637366266646632646261333266663162
+34363339373633333039356266656665303065363063333263623665653330306439383732613936
+61336162633231303734363765333639353038363838353365393961326539636131346162313833
+35626531326463303532363666666631336131363263656633323565663963616233343235303038
+63663830366363393961383736663639366230353635626361303436643561303266303135646132
+64316639363533373262366366333337356661373330653165303263366466626335623232323961
+30396436363064663766626139643335666238613032626462343233336363376531333831326631
+39343366653462323634333932363062666361643033396336303136316565313562383636353564
+30613231343861653432616632653337303163306534623861333738336139306537303438326662
+33333662343264623631653566636638373938653363643036366664643038393037356464393965
+33613231636639376535333666323239373465383330323232306364333139653030383038333866
+36323633353631616231393532646562313039376335363363636561313733616133633230316662
+34616431626661643563636461636562636539333637393634643961643732613236303133653261
+37373233333139636463343535343564636333343665353466323936343239633633653533383961
+66333936353765653532656234323236363535343536663864323330333936353933383131626634
+66643039633664613266626430306164396162303938336531376534663162663039633934346437
+35393565313365633731653963373537313536343232336562663530393936396632333362323737
+35663832646564623434623238653364373432366462383530393735313831343930623136666139
+65633363616265363231353334613061363834336635656261666232326339363739336263613735
+65396236623366323137363162326463626461663562663034336433383138373061366131323365
+62323665323365333365633632396562313936393466313862386230383235303538336164326666
+31373461656565633764373038643237323963333737333362323665633835356461313338666330
+61666133636338313138613135376537663332623632623236363364343364666563323132326632
+62313766366661396638613265666666613030353337323733353739626237636336663438623063
+34656161336135636330613333313931303264656234363539653665353236303037666561636337
+30333766623035623239303238636136373064353336376133343333616639376533313063306664
+62323861356333613336363133353733633530366661633638383831643331363439356137313363
+30366561353163386661663664646435313536323236303061366464386232366436323162656161
+38636562396561616238613930616662336131353461313438373038353938336331643663633639
+33343531623133303634633335353334653538363464313434366466653966643138383832633534
+63626339366234313161663364313765663863393038353461303762323438326534323731656237
+65363634366332366633636334656561326561386564643234636564633866646264376333646462
+38346130623866306564653763353232316265663237383861363062633937333637653731633461
+6466
diff --git a/roles/gitea/vars/main.yml b/roles/gitea/vars/main.yml
index d880ce1..0a26bb2 100644
--- a/roles/gitea/vars/main.yml
+++ b/roles/gitea/vars/main.yml
@@ -27,10 +27,19 @@ gitea_environment: [
   "USER_UID: \"1000\"",
   "USER_GID: \"1000\"",
   "GITEA__database__DB_TYPE: \"postgres\"",
-  "GITEA__database__HOST: \"{{ gitea_postgres_host }}\"",
+  "GITEA__database__HOST: \"{{ shared_service_postgres_01_hostname }}\"",
   "GITEA__database__NAME: \"{{ gitea_postgres_database }}\"",
-  "GITEA__database__USER: \"{{ gitea_postgres_username }}\"",
+  "GITEA__database__USER: \"{{ gitea_postgres_database }}\"",
   "GITEA__database__PASSWD: \"{{ gitea_postgres_password }}\"",
+
+  "GITEA__server__DOMAIN: \"{{ stage_server_domain }}\"",
+  "GITEA__server__SSH_DOMAIN: \"{{ stage_server_domain }}\"",
+  "GITEA__server__ROOT_URL: \"{{ stage_server_url }}\"",
+
+  "GITEA__mailer__ENABLED: \"true\"",
+  "GITEA__mailer__FROM: \"{{ inventory_hostname }}@{{ domain }}\"",
+  "GITEA__server__MAILER_TYPE: \"smtp\"",
+  "GITEA__server__HOST: \"{{ shared_service_mail_hostname }}\"",
 ]
 
 gitea_docker: {
diff --git a/setup.yml b/setup.yml
index 28b54b9..51181c5 100644
--- a/setup.yml
+++ b/setup.yml
@@ -3,6 +3,8 @@
 - name: 'apply setup to {{ host | default("all") }}'
   hosts: '{{ host | default("all") }}'
   serial: "{{ serial_number | default(5) }}"
+  vars:
+    ansible_ssh_host: "{{ stage_server_domain }}"
   remote_user: root
   become: yes
 
diff --git a/smardigo.yml b/smardigo.yml
index 559a275..4ae6cae 100644
--- a/smardigo.yml
+++ b/smardigo.yml
@@ -2,6 +2,8 @@
 - name: 'apply setup to {{ host | default("all") }}'
   hosts: '{{ host | default("all") }}'
   serial: "{{ serial_number | default(5) }}"
+  vars:
+    ansible_ssh_host: "{{ stage_server_domain }}"
   become: yes
 
   pre_tasks:
diff --git a/stage-qa b/stage-qa
index e2ad481..324a4a6 100644
--- a/stage-qa
+++ b/stage-qa
@@ -9,6 +9,9 @@ qa-elastic-stack-elastic-01
 qa-elastic-stack-elastic-02
 qa-elastic-stack-elastic-03
 
+[gitea]
+qa-gitea-01
+
 [harbor]
 qa-docker-registry-01
 
@@ -69,6 +72,7 @@ kube-master
 awx
 connect
 elastic
+gitea
 harbor
 iam
 keycloak