diff --git a/defaults/main.yml b/defaults/main.yaml
similarity index 98%
rename from defaults/main.yml
rename to defaults/main.yaml
index 7f9b2cb..2806058 100644
--- a/defaults/main.yml
+++ b/defaults/main.yaml
@@ -44,3 +44,7 @@ mysql_database_glpi: glpi
 #       mode: 640                                    # Mandatory, filemode
 #       owner: root                                  # Mandatory, logfile owner
 #       group: adm                                   # Mandatory, logfile group owner
+
+
+
+glpi_config_as_code_json: []
diff --git a/tasks/api/api.yaml b/tasks/api/api.yaml
new file mode 100644
index 0000000..d24253d
--- /dev/null
+++ b/tasks/api/api.yaml
@@ -0,0 +1,18 @@
+---
+- name: Always End Session
+  block:
+
+
+    - name: Start Session
+      ansible.builtin.include_tasks:
+        file: api/session-create.yaml
+      when: glpi.api.session | default('') == ''
+
+
+  always:
+
+
+    - name: End Session
+      ansible.builtin.include_tasks:
+        file: api/session-end.yaml
+      when: glpi_session_get.status | default(0) | int == 200
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 8f54866..db78c4f 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -13,7 +13,6 @@
     not glpi_installed | bool
 
 
-
 - name: Configure Log Rotate
   ansible.builtin.include_tasks:
     file: configure.yaml
@@ -31,3 +30,11 @@
 #         and
 #       logrotate | default([]) | length | int > 0
 #     )
+
+- name: API tasks
+  ansible.builtin.include_tasks:
+    file: api/api.yaml
+    apply:
+      tags:
+        - always
+  when: glpi_config_as_code_json length | int > 0