diff --git a/plays/commonlib/vars.yml b/plays/commonlib/vars.yml
index b60943f..17cc07e 100644
--- a/plays/commonlib/vars.yml
+++ b/plays/commonlib/vars.yml
@@ -25,7 +25,6 @@
   include_vars:
     file: "{{ app_config_root }}/config.yml"
     name: "config"
-  register: config_include
 
 - name: Check if an application vault directory exists
   stat:
@@ -41,7 +40,6 @@
     name: "vault"
     extensions:
       - yml
-  register: vault_include
 
 - name: Create the dokku variable dictionary
   set_fact:
@@ -55,17 +53,17 @@
 
 - name: Create the vault variable dictionary
   set_fact:
-    vault: "{{ vault_include.ansible_facts.vault }}"
+    vault: "{{ vars.vault }}"
 
 - name: Create the config variable dictionary
   set_fact:
     config:
       {
-        "vars": "{{ config_include.ansible_facts.config.vars | default([]) }}",
-        "db": "{{ config_include.ansible_facts.config.db | default([]) }}",
-        "env": "{{ config_include.ansible_facts.config.env | default([]) }}",
-        "volumes": "{{ config_include.ansible_facts.config.volumes | default([]) }}",
-        "templates": "{{ config_include.ansible_facts.config.templates | default([]) }}",
+        "vars": "{{ vars.config.vars | default([]) }}",
+        "db": "{{ vars.config.db | default([]) }}",
+        "env": "{{ vars.config.env | default([]) }}",
+        "volumes": "{{ vars.config.volumes | default([]) }}",
+        "templates": "{{ vars.config.templates | default([]) }}",
       }
 
 - name: Debug variable dictionaries