diff --git a/manifests/init.pp b/manifests/init.pp
index 0c2bad64..7fb54aa2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -566,6 +566,7 @@
     $_agent_config = {
       'api_key' => $api_key,
       'dd_url' => $dd_url,
+      'hostname' => $host,
       'cmd_port' => 5001,
       'conf_path' => $datadog_agent::params::conf6_dir,
       'enable_metadata_collection' => $collect_instance_metadata,
diff --git a/spec/classes/datadog_agent_spec.rb b/spec/classes/datadog_agent_spec.rb
index f4fd7342..63e322e5 100644
--- a/spec/classes/datadog_agent_spec.rb
+++ b/spec/classes/datadog_agent_spec.rb
@@ -922,7 +922,18 @@
             end
           end
 
-          context 'with apm_extra_config' do
+          context 'with modified defaults' do
+            context 'hostname override' do
+              let(:params) {{
+                  :host => 'my_custom_hostname',
+              }}
+              it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
+              'content' => /^hostname: my_custom_hostname\n/,
+              )}
+            end
+          end
+
+          context 'with additional agents config' do
             context 'with extra_options and APM enabled' do
               let(:params) {{
                   :apm_enabled => true,