diff --git a/contrib/network-storage/glusterfs/glusterfs.yml b/contrib/network-storage/glusterfs/glusterfs.yml
index 34b6fb2f6abc4600d7fa4b003b3a4df62a70c329..2e6ad7195b13d9892f9bf04640a6429dd7db0eef 100644
--- a/contrib/network-storage/glusterfs/glusterfs.yml
+++ b/contrib/network-storage/glusterfs/glusterfs.yml
@@ -1,8 +1,17 @@
 ---
+- hosts: gfs-cluster
+  gather_facts: false
+  vars:
+    ansible_ssh_pipelining: false
+  roles:
+   - { role: bootstrap-os, tags: bootstrap-os}
+
 - hosts: all
   gather_facts: true
 
 - hosts: gfs-cluster
+  vars:
+    ansible_ssh_pipelining: true
   roles:
     - { role: glusterfs/server }
 
@@ -12,6 +21,5 @@
 
 - hosts: kube-master[0]
   roles:
-    - { role: kubernetes-pv/lib }
     - { role: kubernetes-pv }
 
diff --git a/contrib/network-storage/glusterfs/group_vars b/contrib/network-storage/glusterfs/group_vars
new file mode 120000
index 0000000000000000000000000000000000000000..d64da8dc6112c0f3eefa42ebc4a8dbccd200ec32
--- /dev/null
+++ b/contrib/network-storage/glusterfs/group_vars
@@ -0,0 +1 @@
+../../../inventory/group_vars
\ No newline at end of file
diff --git a/contrib/network-storage/glusterfs/roles/bootstrap-os b/contrib/network-storage/glusterfs/roles/bootstrap-os
new file mode 120000
index 0000000000000000000000000000000000000000..44dbbe482c9318166b93534f1949f754dfeda94e
--- /dev/null
+++ b/contrib/network-storage/glusterfs/roles/bootstrap-os
@@ -0,0 +1 @@
+../../../../roles/bootstrap-os
\ No newline at end of file