diff --git a/reclass/storage/data.sls b/reclass/storage/data.sls
index a47a19a..1574e97 100644
--- a/reclass/storage/data.sls
+++ b/reclass/storage/data.sls
@@ -3,7 +3,7 @@
 
 {%- if storage.data_source.engine == "git" %}
 
-reclass_data_source:
+reclass_git_data_dir:
   git.latest:
   - name: {{ storage.data_source.address }}
   - target: {{ storage.base_dir }}
@@ -16,13 +16,13 @@
 
 {%- endif %}
 
-{%- if storage.data_source.engine == "local" %}
-
 reclass_data_dir:
   file.directory:
   - name: {{ storage.base_dir }}
   - mode: 700
-
+{%- if storage.data_source.engine == "git" %}
+  - require:
+    - git: reclass_git_data_dir
 {%- endif %}
 
 {%- endif %}
diff --git a/reclass/storage/init.sls b/reclass/storage/init.sls
index 5289258..e624f9b 100644
--- a/reclass/storage/init.sls
+++ b/reclass/storage/init.sls
@@ -5,4 +5,4 @@
 {%- if pillar.reclass.storage.node is defined %}
 - reclass.storage.node
 {%- endif %}
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/reclass/storage/node.sls b/reclass/storage/node.sls
index 5fcca8e..bd9d8ac 100644
--- a/reclass/storage/node.sls
+++ b/reclass/storage/node.sls
@@ -1,6 +1,9 @@
 {%- from "reclass/map.jinja" import storage with context %}
 {%- if storage.enabled %}
 
+include:
+  - reclass.storage.data
+
 {{ storage.base_dir }}/nodes/_generated:
   file.directory
 
@@ -14,9 +17,9 @@
   - template: jinja
   - defaults:
       node_name: "{{ node_name }}"
-  - requires:
-    - git: {{ storage.data_source.address }}
+  - require:
+    - file: reclass_data_dir
 
 {%- endfor %}
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}