diff --git a/roles/repospanner/server/tasks/main.yml b/roles/repospanner/server/tasks/main.yml
index fd1a71989c..71c6bedf88 100644
--- a/roles/repospanner/server/tasks/main.yml
+++ b/roles/repospanner/server/tasks/main.yml
@@ -20,6 +20,8 @@
     - /etc/repospanner/
     - /etc/pki/repospanner/
     - /var/lib/repospanner/
+  tags:
+  - repospanner/server
 
 - name: Create group
   group:
@@ -39,6 +41,16 @@
   - repospanner/server
   - config
 
+- name: Create instance directory
+  file:
+    path: /var/lib/repospanner/{{region}}
+    state: directory
+    owner: repoSpanner
+    group: repoSpanner
+    mode: 0755
+  tags:
+  - repospanner/server
+
 - name: Deploy configuration
   template: src=repoSpanner.yml
             dest=/etc/repospanner/{{region}}-config.yml
@@ -75,7 +87,7 @@
 - name: Spawn node
   command: repospanner --config /etc/repospanner/{{region}}-config.yml serve --spawn
   args:
-    creates: /var/lib/repospanner/state/state.json
+    creates: /var/lib/repospanner/{{region}}state/state.json
   become: yes
   become_user: repoSpanner
   when: "spawn_repospanner_node is defined and spawn_repospanner_node == true"
@@ -86,7 +98,7 @@
 - name: Join node
   command: repospanner --config /etc/repospanner/{{region}}-config.yml serve --joinnode https://{{ join_repospanner_node }}:{{ rpc_port }}
   args:
-    creates: /var/lib/repospanner/state/state.json
+    creates: /var/lib/repospanner/{{region}}state/state.json
   become: yes
   become_user: repoSpanner
   when: "spawn_repospanner_node is not defined or spawn_repospanner_node == false"
diff --git a/roles/repospanner/server/templates/repoSpanner.yml b/roles/repospanner/server/templates/repoSpanner.yml
index 5673d2bb09..aa8c28428e 100644
--- a/roles/repospanner/server/templates/repoSpanner.yml
+++ b/roles/repospanner/server/templates/repoSpanner.yml
@@ -1,10 +1,10 @@
 ---
 storage:
-  state: /var/lib/repospanner/state
+  state: /var/lib/repospanner/{{ region }}/state
   git:
     type: tree
     clustered: true
-    directory: /var/lib/repospanner/gitstore
+    directory: /var/lib/repospanner/{{ region }}/gitstore
 listen:
   rpc:  0.0.0.0:{{ rpc_port }}
   http: 0.0.0.0:{{ http_port }}