diff --git a/jobs/loggr-forwarder-agent-windows/monit b/jobs/loggr-forwarder-agent-windows/monit
index 783fd117a..93e2a72f1 100644
--- a/jobs/loggr-forwarder-agent-windows/monit
+++ b/jobs/loggr-forwarder-agent-windows/monit
@@ -17,6 +17,7 @@
     "executable" => "/var/vcap/packages/forwarder-agent-windows/forwarder-agent.exe",
     "args" => [],
     "env" => {
+       "AGENT_HOST" => "#{p("host")}",
        "AGENT_PORT" => "#{p("port")}",
        "AGENT_CA_FILE_PATH" => "#{certs_dir}/loggregator_ca.crt",
        "AGENT_CERT_FILE_PATH" => "#{certs_dir}/forwarder.crt",
diff --git a/jobs/loggr-forwarder-agent-windows/spec b/jobs/loggr-forwarder-agent-windows/spec
index 770270fd1..e85d3adc1 100644
--- a/jobs/loggr-forwarder-agent-windows/spec
+++ b/jobs/loggr-forwarder-agent-windows/spec
@@ -15,6 +15,9 @@ packages:
 - forwarder-agent-windows
 
 properties:
+  host:
+    description: "Host the agent is serving gRPC via mTLS"
+    default: "127.0.0.1"
   port:
     description: "Port the agent is serving gRPC via mTLS"
     default: 3458
diff --git a/jobs/loggr-forwarder-agent/spec b/jobs/loggr-forwarder-agent/spec
index 88c827ff0..fadee9e24 100644
--- a/jobs/loggr-forwarder-agent/spec
+++ b/jobs/loggr-forwarder-agent/spec
@@ -15,6 +15,9 @@ packages:
 - forwarder-agent
 
 properties:
+  host:
+    description: "Host the agent is serving gRPC via mTLS"
+    default: "127.0.0.1"
   port:
     description: "Port the agent is serving gRPC via mTLS"
     default: 3458
diff --git a/jobs/loggr-forwarder-agent/templates/bpm.yml.erb b/jobs/loggr-forwarder-agent/templates/bpm.yml.erb
index 1924ba61a..7e8f502f9 100644
--- a/jobs/loggr-forwarder-agent/templates/bpm.yml.erb
+++ b/jobs/loggr-forwarder-agent/templates/bpm.yml.erb
@@ -21,6 +21,7 @@
       ],
     },
     "env" => {
+      "AGENT_HOST" => "#{p("host")}",
       "AGENT_PORT" => "#{p("port")}",
       "AGENT_CA_FILE_PATH" => "#{certs_dir}/loggregator_ca.crt",
       "AGENT_CERT_FILE_PATH" => "#{certs_dir}/forwarder.crt",
diff --git a/src/cmd/forwarder-agent/app/config.go b/src/cmd/forwarder-agent/app/config.go
index 5fe565de5..022e27bd4 100644
--- a/src/cmd/forwarder-agent/app/config.go
+++ b/src/cmd/forwarder-agent/app/config.go
@@ -11,6 +11,7 @@ import (
 // GRPC stores the configuration for the router as a server using a PORT
 // with mTLS certs and as a client.
 type GRPC struct {
+	Host         string   `env:"AGENT_HOST, report"`
 	Port         uint16   `env:"AGENT_PORT, report"`
 	CAFile       string   `env:"AGENT_CA_FILE_PATH, required, report"`
 	CertFile     string   `env:"AGENT_CERT_FILE_PATH, required, report"`
@@ -40,6 +41,7 @@ type Config struct {
 func LoadConfig() Config {
 	cfg := Config{
 		GRPC: GRPC{
+			Host: "127.0.0.1",
 			Port: 3458,
 		},
 	}
diff --git a/src/cmd/forwarder-agent/app/forwarder_agent.go b/src/cmd/forwarder-agent/app/forwarder_agent.go
index 2f4fc51d9..0cf889b80 100644
--- a/src/cmd/forwarder-agent/app/forwarder_agent.go
+++ b/src/cmd/forwarder-agent/app/forwarder_agent.go
@@ -139,7 +139,7 @@ func (s *ForwarderAgent) Run() {
 	rx := v2.NewReceiver(diode, im, omm)
 
 	s.v2srv = v2.NewServer(
-		fmt.Sprintf("127.0.0.1:%d", s.grpc.Port),
+		fmt.Sprintf("%s:%d", s.grpc.Host, s.grpc.Port),
 		rx,
 		grpc.Creds(serverCreds),
 		grpc.MaxRecvMsgSize(10*1024*1024),