diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 6aae1c9..2ce94a4 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -168,7 +168,11 @@
                 } catch (Exception e) {
                     print "Restarting Salt minion"
                     salt.cmdRun(saltMaster, 'I@gerrit:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
-                    sleep(30)
+                    sleep(5)
+                    // XXX: Restart of salt-minion will cause glusterfs to
+                    // receive SIGTERM and got unmounted which will break
+                    // everything
+                    salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
                     throw e
                 }
             }
@@ -185,7 +189,11 @@
                 } catch (Exception e) {
                     print "Restarting Salt minion"
                     salt.cmdRun(saltMaster, 'I@jenkins:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
-                    sleep(30)
+                    sleep(5)
+                    // XXX: Restart of salt-minion will cause glusterfs to
+                    // receive SIGTERM and got unmounted which will break
+                    // everything
+                    salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
                     throw e
                 }
             }