diff --git a/roles/azure_edges/tasks/azure_cedge_vm.yml b/roles/azure_edges/tasks/azure_cedge_vm.yml
index 6a278ad..1e078d6 100644
--- a/roles/azure_edges/tasks/azure_cedge_vm.yml
+++ b/roles/azure_edges/tasks/azure_cedge_vm.yml
@@ -92,7 +92,7 @@
     cedge_transport_public_ip: "{{ az_transport_public_ip.ip_address }}"
 
 - name: "Set vpn0_default_gateway fact from VPN 0 subnet value"
-  sansible.builtin.et_fact:
+  ansible.builtin.set_fact:
     vpn0_default_gateway: "{{ subnet.cidr | ansible.utils.ipaddr('1') | ansible.utils.ipaddr('address') }}"
   loop: "{{ az_subnets }}"
   loop_control:
diff --git a/roles/azure_edges/tasks/main.yml b/roles/azure_edges/tasks/main.yml
index 015c307..80e2201 100644
--- a/roles/azure_edges/tasks/main.yml
+++ b/roles/azure_edges/tasks/main.yml
@@ -20,7 +20,7 @@
 - name: Assert all required variables for Azure cEdges deployment
   ansible.builtin.include_role:
     name: common
-    tasks_from: aws_required_variables
+    tasks_from: required_variables
     defaults_from: az_required_vars_edges.yml
 
 - name: "Replace underscores with hyphens in the az_resources_prefix string"
diff --git a/roles/template_cloudinit/tasks/main.yml b/roles/template_cloudinit/tasks/main.yml
index 809897f..7a62777 100644
--- a/roles/template_cloudinit/tasks/main.yml
+++ b/roles/template_cloudinit/tasks/main.yml
@@ -13,7 +13,7 @@
 - name: Assert all required variables for AWS cloudinit generation
   ansible.builtin.include_role:
     name: common
-    tasks_from: aws_required_variables
+    tasks_from: required_variables
     defaults_from: required_vars_controllers.yml
 
 - name: "Prepare directory for results, path: {{ results_dir }}"