diff --git a/share/organisation/ci-space.tf b/share/organisation/ci-space.tf
index 82c11ef..cfcd661 100644
--- a/share/organisation/ci-space.tf
+++ b/share/organisation/ci-space.tf
@@ -81,7 +81,7 @@ resource "kubernetes_secret" "ci-docker-config" {
         "${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = {
           "username" = gitea_user.user-ci[0].username
           "password" = random_password.password.result
-          "email"    = var.registry_email
+          "email"    = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}"
           "auth"     = base64encode("${gitea_user.user-ci[0].username}:${random_password.password.result}")
         }
       }
diff --git a/share/organisation/stages.tf b/share/organisation/stages.tf
index 1655142..0f79758 100644
--- a/share/organisation/stages.tf
+++ b/share/organisation/stages.tf
@@ -47,7 +47,7 @@ resource "kubernetes_secret" "docker-config" {
   count = var.haveGitea?length(local.sorted-stages):0
   metadata {
     name = "gitea-docker"
-    namespace = "${local.sorted-datasets[count.index].namespace}"
+    namespace = "${local.sorted-stages[count.index].namespace}"
   }
   type = "kubernetes.io/dockerconfigjson"
   data = {
@@ -56,7 +56,7 @@ resource "kubernetes_secret" "docker-config" {
         "${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = {
           "username" = gitea_user.user-ci[0].username
           "password" = random_password.password.result
-          "email"    = var.registry_email
+          "email"    = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}"
           "auth"     = base64encode("${gitea_user.user-ci[0].username}:${random_password.password.result}")
         }
       }