diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0555e54eb24..94e2c0634b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@
 
 - [ENHANCEMENT] Allow reloading configuration using `SIGHUP` signal. (@tharun208)
 
+- [ENHANCEMENT] Add HOSTNAME environment variable to service file to allow for expanding
+  the $HOSTNAME variable in agent config.  (@dfrankel33)
+
 - [BUGFIX] Regex capture groups like `${1}` will now be kept intact when
   using `-config.expand-env`.
 
@@ -56,7 +59,7 @@
 
 - [FEATURE] Added [Kafka Lag exporter](https://github.com/davidmparrott/kafka_exporter)
   integration. (@gaantunes)
-  
+
 - [BUGFIX] Fix race condition that may occur and result in a panic when
   initializing scraping service cluster. (@rfratto)
 
diff --git a/packaging/deb/grafana-agent.service b/packaging/deb/grafana-agent.service
index e2ef863c8ef4..5a7401de737c 100644
--- a/packaging/deb/grafana-agent.service
+++ b/packaging/deb/grafana-agent.service
@@ -7,6 +7,7 @@ After=network-online.target
 [Service]
 Restart=always
 User=grafana-agent
+Environment=HOSTNAME=%H
 EnvironmentFile=/etc/default/grafana-agent
 ExecStart=/usr/bin/grafana-agent --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
 # If running the Agent in scraping service mode, you will want to override this value with
diff --git a/packaging/rpm/grafana-agent.service b/packaging/rpm/grafana-agent.service
index 3fc7b199da4d..e0bb535504ea 100644
--- a/packaging/rpm/grafana-agent.service
+++ b/packaging/rpm/grafana-agent.service
@@ -7,6 +7,7 @@ After=network-online.target
 [Service]
 Restart=always
 User=grafana-agent
+Environment=HOSTNAME=%H
 EnvironmentFile=/etc/sysconfig/grafana-agent
 ExecStart=/usr/bin/grafana-agent --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
 # If running the Agent in scraping service mode, you will want to override this value with