diff --git a/roles/api/defaults/main.yml b/roles/api/defaults/main.yml
index 0257b03..e554901 100644
--- a/roles/api/defaults/main.yml
+++ b/roles/api/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-# TODO
-backup: false
 # Easier debugging
 debug: false
 desired_state: present
diff --git a/roles/api/tasks/backup.yml b/roles/api/tasks/backup.yml
deleted file mode 100644
index fa62e99..0000000
--- a/roles/api/tasks/backup.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Backup .env
-  when: backup | bool
-  ansible.builtin.fetch:
-    src: /home/semaphore/.env
-    dest: files/
-    flat: true
diff --git a/roles/api/tasks/cookie.yml b/roles/api/tasks/cookie.yml
index 02c7fd2..fa0ce59 100644
--- a/roles/api/tasks/cookie.yml
+++ b/roles/api/tasks/cookie.yml
@@ -1,24 +1,9 @@
-- name: Get admin user
-  ansible.builtin.shell: |
-    set -o pipefail;
-    grep SEMAPHORE_ADMIN= {{ semaphore_env }} | cut -d= -f2 | sed 's/"//g'
-  register: admin_user
-  changed_when: false
-  no_log: "{{ not debug }}"
-
-- name: Get admin password
-  ansible.builtin.shell: |
-    set -o pipefail;
-    grep SEMAPHORE_ADMIN_PASSWORD= {{ semaphore_env }} | cut -d= -f2
-  register: admin_pass
-  changed_when: false
-  no_log: "{{ not debug }}"
-
+---
 - name: Set facts
   ansible.builtin.set_fact:
-    semaphore_admin_user: "{{ admin_user.stdout }}"
-    semaphore_admin_password: "{{ admin_pass.stdout[1:] }}="
-  no_log: "{{ not debug }}"
+    semaphore_admin_user: "{{ vault_admin_user }}"
+    semaphore_admin_password: "{{ vault_admin_password }}"
+  no_log: true
 
 - name: Set API token
   ansible.builtin.uri:
@@ -30,10 +15,12 @@
     status_code: 204
     timeout: 5
   register: login_response
-  no_log: "{{ not debug }}"
+  no_log: true
 
 - name: Save Cookie
   when: login_response.status == 204
   ansible.builtin.set_fact:
     cookie: "{{ login_response.cookies_string }}"
-  no_log: "{{ not debug }}"
+  no_log: true
+
+-
diff --git a/roles/api/tasks/present.yml b/roles/api/tasks/present.yml
index 345bc23..2ce4e0b 100644
--- a/roles/api/tasks/present.yml
+++ b/roles/api/tasks/present.yml
@@ -3,9 +3,6 @@
 - name: Authenticate
   ansible.builtin.include_tasks: cookie.yml
 
-- name: Backup
-  ansible.builtin.include_tasks: backup.yml
-
 - name: Create Controller
   ansible.builtin.include_tasks: controller.yml