diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index b59417a..8f53f21 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -1,8 +1,6 @@
 classes:
 - service.elasticsearch.server.cluster
 - service.java.environment
-- service.glusterfs.server
-- service.glusterfs.client
 parameters:
   _param:
     java_environment_version: "8"
@@ -40,34 +38,3 @@
         - host: ${_param:cluster_node01_address}
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
-      snapshot:
-        repo:
-          path: /var/lib/elasticsearch/repo
-  glusterfs:
-    server:
-      peers:
-        - ${_param:cluster_node01_address}
-        - ${_param:cluster_node02_address}
-        - ${_param:cluster_node03_address}
-      volumes:
-        elasticrepo:
-          storage: /srv/glusterfs/elasticrepo
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/elasticrepo
-            - ${_param:cluster_node02_address}:/srv/glusterfs/elasticrepo
-            - ${_param:cluster_node03_address}:/srv/glusterfs/elasticrepo
-          options:
-            cluster.readdir-optimize: On
-            cluster.lookup-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
-    client:
-      volumes:
-        elasticrepo:
-          path: /var/lib/elasticsearch/repo
-          server: ${_param:cluster_node01_address}
-          user: elasticsearch
-          group: elasticsearch
diff --git a/elasticsearch/server/storage/glusterfs.yml b/elasticsearch/server/storage/glusterfs.yml
new file mode 100644
index 0000000..25e9c54
--- /dev/null
+++ b/elasticsearch/server/storage/glusterfs.yml
@@ -0,0 +1,37 @@
+classes:
+- service.glusterfs.server
+- service.glusterfs.client
+parameters:
+  elasticsearch:
+    server:
+      snapshot:
+        repo:
+          path: /var/lib/elasticsearch/repo
+  glusterfs:
+    server:
+      peers:
+        - ${_param:cluster_node01_address}
+        - ${_param:cluster_node02_address}
+        - ${_param:cluster_node03_address}
+      volumes:
+        elasticrepo:
+          storage: /srv/glusterfs/elasticrepo
+          replica: 3
+          bricks:
+            - ${_param:cluster_node01_address}:/srv/glusterfs/elasticrepo
+            - ${_param:cluster_node02_address}:/srv/glusterfs/elasticrepo
+            - ${_param:cluster_node03_address}:/srv/glusterfs/elasticrepo
+          options:
+            cluster.readdir-optimize: On
+            cluster.lookup-optimize: On
+            nfs.disable: On
+            network.remote-dio: On
+            diagnostics.client-log-level: WARNING
+            diagnostics.brick-log-level: WARNING
+    client:
+      volumes:
+        elasticrepo:
+          path: /var/lib/elasticsearch/repo
+          server: ${_param:cluster_node01_address}
+          user: elasticsearch
+          group: elasticsearch