diff --git a/hosts-config.yaml b/hosts-config.yaml
index 5a2117164e..c02c420824 100644
--- a/hosts-config.yaml
+++ b/hosts-config.yaml
@@ -31,7 +31,7 @@ outputs:
       The content that should be appended to your /etc/hosts if you want to get
       hostname-based access to the deployed nodes (useful for testing without
       setting up a DNS).
-    value: {get_attr: [hostsConfigImpl, config, hosts]}
+    value: {get_param: hosts}
   OS::stack_id:
     description: The ID of the hostsConfigImpl resource.
     value: {get_resource: hostsConfigImpl}
diff --git a/releasenotes/notes/add-all-hosts-to-hostsentry-20a8ee8a1a210ce2.yaml b/releasenotes/notes/add-all-hosts-to-hostsentry-20a8ee8a1a210ce2.yaml
new file mode 100644
index 0000000000..b0ad9d936e
--- /dev/null
+++ b/releasenotes/notes/add-all-hosts-to-hostsentry-20a8ee8a1a210ce2.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - Previously only the VIPs and their associated hostnames were present
+    in the HostsEntry output, due to the hosts_entries output on the
+    hosts-config.yaml nested stack being empty. It was referencing an
+    invalid attribute. See
+    https://bugs.launchpad.net/tripleo/+bug/1683517
+
+