diff --git a/defaults/main.yml b/defaults/main.yml
index 9c979af0..8bd8a297 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,8 +49,8 @@ apache_mods_disabled: []
 # Set initial apache state. Recommended values: `started` or `stopped`
 apache_state: started
 
-# Set initial apache service status. Recommended values: `yes` or `no`
-apache_enabled: yes
+# Set initial apache service status. Recommended values: `true` or `false`
+apache_enabled: true
 
 # Set apache state when configuration changes are made. Recommended values:
 # `restarted` or `reloaded`
diff --git a/vars/apache-24.yml b/vars/apache-24.yml
index 449a444e..cdd66e55 100644
--- a/vars/apache-24.yml
+++ b/vars/apache-24.yml
@@ -4,5 +4,5 @@ apache_default_vhost_filename: 000-default.conf
 apache_ports_configuration_items:
   - {
     regexp: "^Listen ",
-    line: "Listen {{ apache_listen_port }}"
+    line: "Listen {{ (apache_listen_ip == '*') | ternary('', apache_listen_ip + ':') }}{{ apache_listen_port }}"
   }