diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index 087b681..d658d80 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -11,4 +11,4 @@
 - name: Use EC2 instance ID for cluster node ID
   set_fact:
     atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
-    atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }}"
+    atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4) }}"
diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml
index ecf2a75..9800b6d 100644
--- a/roles/product_startup/handlers/main.yml
+++ b/roles/product_startup/handlers/main.yml
@@ -1,13 +1,13 @@
 ---
 
 - name: Restart Product
-  service:
+  systemd:
     name: "{{ atl_systemd_service_name }}"
     state: restarted
   when: atl_startup_restart
 
 - name: Enable Product
-  service:
+  systemd:
     name: "{{ atl_systemd_service_name }}"
     enabled: true
   when: atl_startup_enable