diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cf27c250f50b25acb102992d858c9c7bd680917..ff93f64a110e435bf7eef60045407a53239f944d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +2,15 @@ stages:
   - check
   - test
 
+before_script:
+  - ln -s /builds /go/src/code.vereign.com
+  - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
+
 generate:swagger:
   image: golang:1.21.3
   stage: check
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - ./generate_swagger.sh
@@ -36,9 +37,6 @@ linters:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - golangci-lint --version
@@ -49,9 +47,6 @@ unit tests:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - go test -race ./... -coverprofile=coverage.out
@@ -63,9 +58,6 @@ govulncheck:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - go install golang.org/x/vuln/cmd/govulncheck@latest
diff --git a/internal/service/ocm_mail_delivery.go b/internal/service/ocm_mail_delivery.go
index 8f255d8ebff747a63585680eee854122e3b5524c..6af7adfdafe4b6d467bddd960353db4cd7036f42 100644
--- a/internal/service/ocm_mail_delivery.go
+++ b/internal/service/ocm_mail_delivery.go
@@ -69,10 +69,16 @@ func (s *Service) ocmSendEmail(ctx context.Context, origin net.Addr, connID stri
 		return "", fmt.Errorf("error parsing FROM header: %v", err)
 	}
 
+	hostname, err := s.didcomm.ServiceEndpointHostname()
+	if err != nil {
+		return "", err
+	}
+
 	// generate unique message identifier and add to email headers
 	msgID = uuid.NewString()
 	msg.AddHeaders(map[string]string{
-		headerMessageID: msgID,
+		headerMessageID:    msgID,
+		headerSvdxHostname: hostname,
 	})
 
 	// add custom Received header value
diff --git a/internal/service/service.go b/internal/service/service.go
index 83849e291c4cf98a245e476d4e03e385e446b70e..9f9a83534447ed9dd79df978c497af60f6f3f7e6 100644
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -26,6 +26,7 @@ const (
 	headerDIDConnectionID    = "x-did-connection-id"
 	headerRecipientEmail     = "x-recipient-email"
 	headerMessageID          = "x-message-id"
+	headerSvdxHostname       = "x-svdx-hostname"
 	headerFrom               = "from"
 )