diff --git a/glance/files/juno/glance-api.conf.Debian b/glance/files/juno/glance-api.conf.Debian
index b0e68a7..e031a00 100644
--- a/glance/files/juno/glance-api.conf.Debian
+++ b/glance/files/juno/glance-api.conf.Debian
@@ -498,7 +498,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # A list of directories where image data can be stored.
 # This option may be specified multiple times for specifying multiple store
diff --git a/glance/files/juno/glance-cache.conf.Debian b/glance/files/juno/glance-cache.conf.Debian
index ab7a87f..0f88d1a 100644
--- a/glance/files/juno/glance-cache.conf.Debian
+++ b/glance/files/juno/glance-cache.conf.Debian
@@ -63,7 +63,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # ============ Swift Store Options =============================
 
diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index b1d32f7..c854402 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -62,7 +62,7 @@
 # Allow access to version 2 of glance api
 #enable_v2_api = True
 
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # Return the URL that references where the data is stored on
 # the backend storage system.  For example, if using the
@@ -590,7 +590,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # A list of directories where image data can be stored.
 # This option may be specified multiple times for specifying multiple store
diff --git a/glance/files/kilo/glance-cache.conf.Debian b/glance/files/kilo/glance-cache.conf.Debian
index c8c8f37..d233076 100644
--- a/glance/files/kilo/glance-cache.conf.Debian
+++ b/glance/files/kilo/glance-cache.conf.Debian
@@ -55,7 +55,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # ============ Swift Store Options =============================
 
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index db1ef1c..3485a7f 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -66,7 +66,7 @@
 # Allow access to version 2 of glance api
 #enable_v2_api = True
 
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # Return the URL that references where the data is stored on
 # the backend storage system.  For example, if using the
@@ -599,7 +599,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # A list of directories where image data can be stored.
 # This option may be specified multiple times for specifying multiple store
diff --git a/glance/files/liberty/glance-cache.conf.Debian b/glance/files/liberty/glance-cache.conf.Debian
index c8c8f37..d233076 100644
--- a/glance/files/liberty/glance-cache.conf.Debian
+++ b/glance/files/liberty/glance-cache.conf.Debian
@@ -55,7 +55,7 @@
 
 # Directory that the Filesystem backend store
 # writes image data to
-filesystem_store_datadir = /var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # ============ Swift Store Options =============================
 
diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
index 3efb9dc..06e7183 100644
--- a/glance/files/mitaka/glance-api.conf.Debian
+++ b/glance/files/mitaka/glance-api.conf.Debian
@@ -1150,7 +1150,7 @@
 # Directory to which the Filesystem backend store writes images.
 # (string value)
 #filesystem_store_datadir = /var/lib/glance/images
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 # List of directories and its priorities to which the Filesystem
 # backend store writes images. (multi valued)
diff --git a/glance/files/newton/glance-api.conf.Debian b/glance/files/newton/glance-api.conf.Debian
index de83148..34e29ec 100644
--- a/glance/files/newton/glance-api.conf.Debian
+++ b/glance/files/newton/glance-api.conf.Debian
@@ -2271,7 +2271,7 @@
 #
 #  (string value)
 #filesystem_store_datadir = /var/lib/glance/images
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 #
 # List of directories and their priorities to which the filesystem
diff --git a/glance/files/newton/glance-glare.conf.Debian b/glance/files/newton/glance-glare.conf.Debian
index f510066..f4b9931 100644
--- a/glance/files/newton/glance-glare.conf.Debian
+++ b/glance/files/newton/glance-glare.conf.Debian
@@ -1034,7 +1034,7 @@
 #
 #  (string value)
 #filesystem_store_datadir = /var/lib/glance/images
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 
 #
diff --git a/glance/files/newton/glance-registry.conf.Debian b/glance/files/newton/glance-registry.conf.Debian
index 6385f25..f736108 100644
--- a/glance/files/newton/glance-registry.conf.Debian
+++ b/glance/files/newton/glance-registry.conf.Debian
@@ -1149,7 +1149,7 @@
 #use_tpool = false
 
 [glance_store]
-filesystem_store_datadir = /var/lib/glance/images
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 swift_store_endpoint_type = {{ server.identity.get('endpoint_type', 'publicURL') }}
 
diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
index 8b3f40d..28bd4dc 100644
--- a/glance/files/ocata/glance-api.conf.Debian
+++ b/glance/files/ocata/glance-api.conf.Debian
@@ -2337,7 +2337,7 @@
 #
 #  (string value)
 #filesystem_store_datadir = /var/lib/glance/images
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 #
 # List of directories and their priorities to which the filesystem
diff --git a/glance/files/ocata/glance-glare.conf.Debian b/glance/files/ocata/glance-glare.conf.Debian
index f510066..f4b9931 100644
--- a/glance/files/ocata/glance-glare.conf.Debian
+++ b/glance/files/ocata/glance-glare.conf.Debian
@@ -1034,7 +1034,7 @@
 #
 #  (string value)
 #filesystem_store_datadir = /var/lib/glance/images
-filesystem_store_datadir=/var/lib/glance/images/
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 
 #
diff --git a/glance/files/ocata/glance-registry.conf.Debian b/glance/files/ocata/glance-registry.conf.Debian
index 6385f25..f736108 100644
--- a/glance/files/ocata/glance-registry.conf.Debian
+++ b/glance/files/ocata/glance-registry.conf.Debian
@@ -1149,7 +1149,7 @@
 #use_tpool = false
 
 [glance_store]
-filesystem_store_datadir = /var/lib/glance/images
+filesystem_store_datadir = {{ server.get('filesystem_store_datadir', '/var/lib/glance/images/') }}
 
 swift_store_endpoint_type = {{ server.identity.get('endpoint_type', 'publicURL') }}