diff --git a/backend/optout/rpc/infra/optout-rpc-service/values.yaml b/backend/optout/rpc/infra/optout-rpc-service/values.yaml
index 38d7e35858..5366e99708 100644
--- a/backend/optout/rpc/infra/optout-rpc-service/values.yaml
+++ b/backend/optout/rpc/infra/optout-rpc-service/values.yaml
@@ -72,7 +72,7 @@ k8sServiceChart:
       NR_NAME: "${env.name}"
       NR_LICENSE: "3289b893db560c39096d3c222d4a33037c24f943"
       NR_TRACING: "true"
-      WEBHOOK_RPC_ADDRESS: "webhook-rpc-service:10002"
       OPTOUTLINK_DOMAIN: "optout.${environmentVariable.dns}"
-      SMS_RPC_ADDRESS: "sms-rpc-service:10009"
+      WEBHOOK_RPC_ADDRESS: "webhook-rpc-service:10002"
       MMS_RPC_ADDRESS: "mms-rpc-service:10007"
+      SMS_RPC_ADDRESS: "sms-rpc-service:10009"
diff --git a/backend/track_link/inbound/infra/track-link-inbound-service/values.yaml b/backend/track_link/inbound/infra/track-link-inbound-service/values.yaml
index e6359e7e92..6d3ca10a5c 100644
--- a/backend/track_link/inbound/infra/track-link-inbound-service/values.yaml
+++ b/backend/track_link/inbound/infra/track-link-inbound-service/values.yaml
@@ -80,5 +80,5 @@ k8sServiceChart:
       NR_NAME: "${env.name}"
       NR_LICENSE: "3289b893db560c39096d3c222d4a33037c24f943"
       NR_TRACING: "true"
-      TRACK_LINK_RPC_ADDRESS: "track-link-rpc-service"
+      TRACK_LINK_RPC_ADDRESS: "track-link-rpc-service:10010"
       INBOUND_PORT: "10013"
diff --git a/backend/track_link/rpc/infra/track-link-rpc-service/values.yaml b/backend/track_link/rpc/infra/track-link-rpc-service/values.yaml
index 37a65f5261..cc71a26306 100644
--- a/backend/track_link/rpc/infra/track-link-rpc-service/values.yaml
+++ b/backend/track_link/rpc/infra/track-link-rpc-service/values.yaml
@@ -73,6 +73,6 @@ k8sServiceChart:
       NR_LICENSE: "3289b893db560c39096d3c222d4a33037c24f943"
       NR_TRACING: "true"
       TRACKLINK_DOMAIN: "track.${environmentVariable.dns}"
+      WEBHOOK_RPC_ADDRESS: "webhook-rpc-service:10002"
       MMS_RPC_ADDRESS: "mms-rpc-service:10007"
       SMS_RPC_ADDRESS: "sms-rpc-service:10009"
-      WEBHOOK_RPC_ADDRESS: "webhook-rpc-service:10002"
diff --git a/backend/webhook/rpc/service/track_link.go b/backend/webhook/rpc/service/track_link.go
index ee4bf41704..f92ce6d4ae 100644
--- a/backend/webhook/rpc/service/track_link.go
+++ b/backend/webhook/rpc/service/track_link.go
@@ -15,26 +15,33 @@ func (s *webhookImpl) PublishLinkHit(ctx context.Context, p *webhookpb.PublishLi
 	}
 
 	for _, w := range webhooks {
-		err = s.queue.PostWebhook(ctx, msg.WebhookMessageSpec{
+		sourceMessage := PublishMessageData{}
+		if p.SourceMessage != nil {
+			sourceMessage = PublishMessageData{
+				Type:         p.SourceMessage.Type,
+				Id:           p.SourceMessage.Id,
+				Recipient:    p.SourceMessage.Recipient,
+				Sender:       p.SourceMessage.Sender,
+				Subject:      p.SourceMessage.Subject,
+				Message:      p.SourceMessage.Message,
+				Content_urls: p.SourceMessage.ContentURLs,
+				Message_ref:  p.SourceMessage.MessageRef,
+			}
+		}
+
+		if err := s.queue.PostWebhook(ctx, msg.WebhookMessageSpec{
 			URL:       w.URL,
 			RateLimit: int(w.RateLimit),
 			Payload: msg.WebhookBody{
 				Event: EventLinkHitStatus,
 				Data: PublishLinkHitData{
-					URL:       p.URL,
-					Hits:      int(p.Hits),
-					Timestamp: p.Timestamp.AsTime().Format(time.RFC3339),
-					Source_message: PublishMessageData{
-						Type:         p.SourceMessage.Type,
-						Id:           p.SourceMessage.Id,
-						Recipient:    p.SourceMessage.Recipient,
-						Sender:       p.SourceMessage.Sender,
-						Subject:      p.SourceMessage.Subject,
-						Message:      p.SourceMessage.Message,
-						Content_urls: p.SourceMessage.ContentURLs,
-						Message_ref:  p.SourceMessage.MessageRef,
-					}}}})
-		if err != nil {
+					URL:            p.URL,
+					Hits:           int(p.Hits),
+					Timestamp:      p.Timestamp.AsTime().Format(time.RFC3339),
+					Source_message: sourceMessage,
+				},
+			},
+		}); err != nil {
 			return &webhookpb.NoReply{}, err
 		}
 	}
diff --git a/docker-compose.yml b/docker-compose.yml
index f8d398caff..7bf544697f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,8 @@ services:
       - "10004:10004"
       - "10005:10005"
       - "10006:10006" 
-      - "10012:10012" 
+      - "10012:10012"
+      - "10013:10013" 
       - "10014:10014"
     environment:
       - DISABLE_NEW_RELIC=true
@@ -91,8 +92,6 @@ services:
       - SMS_OPTOUT_RPC_ADDRESS=backend:10011
       - SMS_SENDER_RPC_ADDRESS=sender-rpc-service:10015
 
-      - OPTOUTLINK_DOMAIN=localhost:10010
-      - TRACKLINK_DOMAIN=localhost:10010
       - OPTOUT_INBOUND_PORT=10012
       - OPTOUT_RPC_ADDRESS=backend:10011
       - OPTOUT_POSTGRES_URL=postgresql://postgres:example@postgres/optout
@@ -100,10 +99,10 @@ services:
       - OPTOUT_OPTOUTLINK_DOMAIN=localhost:10012
       - OPTOUT_WEBHOOK_RPC_ADDRESS=webhook-rpc-service:10002
 
-      - TRACK_LINK_RPC_ADDRESS=backend:10010
       - TRACK_LINK_INBOUND_PORT=10013
+      - TRACK_LINK_RPC_ADDRESS=backend:10010
       - TRACK_LINK_POSTGRES_URL=postgresql://postgres:example@postgres/track_link
-      - TRACK_LINK_TRACKLINK_DOMAIN=localhost:10010
+      - TRACK_LINK_TRACKLINK_DOMAIN=localhost:10013
       - TRACK_LINK_WEBHOOK_RPC_ADDRESS=webhook-rpc-service:10002
 
       - JAEGER_AGENT_HOST=jaeger