diff --git a/roles/ufw/defaults/main.yml b/roles/ufw/defaults/main.yml
index 7aa973f..702f638 100644
--- a/roles/ufw/defaults/main.yml
+++ b/roles/ufw/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
-rules: []
-limit_ssh: false
-openssh_port: 22
+ufw_rules: []
+ufw_limit_ssh: false
+ufw_openssh_port: 22
diff --git a/roles/ufw/meta/main.yml b/roles/ufw/meta/main.yml
index 39c7f50..004334a 100644
--- a/roles/ufw/meta/main.yml
+++ b/roles/ufw/meta/main.yml
@@ -10,8 +10,8 @@ galaxy_info:
 
   platforms:
     - name: "Ubuntu"
-      versions: [ "focal", "jammy" ]
+      versions: ["focal", "jammy"]
 
-  galaxy_tags: [ ]
+  galaxy_tags: []
 
 dependencies: []
diff --git a/roles/ufw/molecule/default/converge.yml b/roles/ufw/molecule/default/converge.yml
index 26ef0bd..ddd580c 100644
--- a/roles/ufw/molecule/default/converge.yml
+++ b/roles/ufw/molecule/default/converge.yml
@@ -11,7 +11,7 @@
         comment: "Allow all incoming traffic on eth0@if288"
 
   roles:
-    - role: genlab.ufw
+    - role: genlab.common.ufw
       disable_ipv6: true
-      limit_ssh: true
-      rules: "{{ custom_rules }}"
+      ufw_limit_ssh: true
+      ufw_rules: "{{ custom_rules }}"
diff --git a/roles/ufw/tasks/main.yml b/roles/ufw/tasks/main.yml
index 21973d5..30885d3 100644
--- a/roles/ufw/tasks/main.yml
+++ b/roles/ufw/tasks/main.yml
@@ -28,13 +28,13 @@
 - name: "Allow SSH access"
   notify: Reload-ufw
   community.general.ufw:
-    rule: "{{ limit_ssh | ternary('limit', 'allow') }}"
-    port: "{{ openssh_port }}"
+    rule: "{{ ufw_limit_ssh | ternary('limit', 'allow') }}"
+    port: "{{ ufw_openssh_port }}"
     proto: tcp
 
 - name: "Set whitelist rules"
   notify: Reload-ufw
-  loop: "{{ rules }}"
+  loop: "{{ ufw_rules }}"
   community.general.ufw:
     rule: "{{ item.rule | default('allow') }}"
     comment: "{{ item.comment | default(omit) }}"