diff --git a/tasks/create_user.yml b/tasks/create_user.yml
index cddb9b4..7d89610 100644
--- a/tasks/create_user.yml
+++ b/tasks/create_user.yml
@@ -2,17 +2,17 @@
 - name: "Create EteBase Group"
   become: true
   ansible.builtin.group:
-    name: "{{ etebase_group }}"
+    name: "{{ etebase__group }}"
     system: true
     state: "present"
 
 - name: "Create Etebase User"
   become: true
   ansible.builtin.user:
-    name: "{{ etebase_user }}"
+    name: "{{ etebase__user }}"
     comment: "Etebase User"
-    group: "{{ etebase_group }}"
-    groups: "{{ etebase_groups | default(omit) }}"
-    home: "{{ etebase_user_home }}"
-    shell: "{{ etebase_shell }}"
+    group: "{{ etebase__group }}"
+    groups: "{{ etebase__groups | default(omit) }}"
+    home: "{{ etebase__user_home }}"
+    shell: "{{ etebase__shell }}"
     system: true
diff --git a/tasks/python_venv.yml b/tasks/python_venv.yml
index 450f0d5..ae8e292 100644
--- a/tasks/python_venv.yml
+++ b/tasks/python_venv.yml
@@ -10,15 +10,15 @@
   ansible.builtin.pip:
     name: bottle
     # requirements: /my_app/requirements.txt
-    virtualenv: "{{ etebase_venv }}"
-    state: "{{ etebase_package_state }}"
+    virtualenv: "{{ etebase__venv }}"
+    state: "{{ etebase__package_state }}"
     umask: "0027"
 
 - name: Fix venv File owner/group
   become: true
   ansible.builtin.file:
-    path: "{{ etebase_venv }}"
+    path: "{{ etebase__venv }}"
     state: directory
     mode: 'u=rwX,g=rX,o='
-    group: "{{ etebase_group }}"
-    owner: "{{ etebase_user }}"
+    group: "{{ etebase__group }}"
+    owner: "{{ etebase__user }}"