diff --git a/shell/templates/clvm b/shell/templates/clvm
index 1d90ef92fe..4961edc7b2 100644
--- a/shell/templates/clvm
+++ b/shell/templates/clvm
@@ -1,48 +1,51 @@
 %name clvm
 
 # Cluster-aware lvm (cloned)
 #
 # This template generates a cloned instance of clvm and one
 # volume group
 #
 # NB: You need just one clvm, regardless of how many volume
 # groups. In other words, you can use this template only for one
 # volume group and to make another one, you'll have to edit the
 # resulting configuration yourself.
 
 %required
 
-# Name the volume group
-# (for example: vg-1)
-# NB: The clone is going to be named c-<id> (e.g. c-vg-1)
+# Name the volume group (for example: vg-1)
+# The LVM resource will be in a cloned group with the rest
+# of the prerequisite resources. The clone is going to be named c-<id>
+# (e.g. c-vg-1)
 
 %% id 
 
 # The volume group name
 
 %% volgrpname 
 
 %generate
 
+primitive %_:id ocf:heartbeat:LVM
+	params volgrpname="%_:volgrpname"
+	op start timeout=60s
+	op stop timeout=60s
+	op monitor interval=30s timeout=60s
+
 primitive dlm ocf:pacemaker:controld
+	op start timeout=90s
+	op stop timeout=100s
 
 primitive clvm ocf:lvm2:clvmd
 	params daemon_timeout="30"
+	op start timeout=90s
+	op stop timeout=100s
 
 primitive cmirror ocf:lvm2:cmirrord
 	params daemon_timeout="30"
+	op start timeout=90s
+	op stop timeout=100s
 
-group lvm2stage dlm clvm cmirror
-
-clone c-lvm2stage lvm2stage
-	meta interleave="true" ordered="true"
-
-primitive %_:id ocf:heartbeat:LVM
-	params volgrpname="%_:volgrpname"
+group g-%_:id dlm clvm cmirror %_:id
 
-clone c-%_:id %_:id
+clone c-%_:id g-%_:id
 	meta interleave="true" ordered="true"
-
-colocation colo-%_:id-lvm2stage inf: c-%_:id c-lvm2stage
-
-order order-%_:id-lvm2stage inf: c-lvm2stage c-%_:id
diff --git a/shell/templates/ocfs2 b/shell/templates/ocfs2
index 75536710bc..b28acd5836 100644
--- a/shell/templates/ocfs2
+++ b/shell/templates/ocfs2
@@ -1,64 +1,68 @@
 %name ocfs2
 
 # ocfs2 filesystem (cloned)
 #
 # This template generates a cloned instance of the ocfs2 filesystem
 #
 # NB: You need only one dlm/o2cb/clvm, regardless of how many
 # filesystems. In other words, you can use this template only for
 # one filesystem and to make another one, you'll have to edit the
 # resulting configuration yourself.
 
 %required
 
-# Name the ocfs2 filesystem
-# (for example: bigfs)
-# NB: The clone is going to be named c-<id> (e.g. c-bigfs)
+# Name the ocfs2 filesystem (for example: bigfs)
+# The filesystem resource will be in a cloned group with the rest
+# of the prerequisite resources. The clone is going to be named c-<id>
+# (e.g. c-bigfs)
 
 %% id 
 
 # The mount point
 
 %% directory 
 
 # The device
 
 %% device 
 
 # optional parameters for the ocfs2 filesystem
 
 %optional
 
 # mount options
 
 %% options
 
 %generate
 
 primitive %_:id ocf:heartbeat:Filesystem
 	params
 		directory="%_:directory"
 		fstype="ocfs2"
 		device="%_:device"
 		opt options="%_:options"
+	op start timeout=60s
+	op stop timeout=60s
 
-monitor %_:id 20:40
-
-clone c-%_:id %_:id
-	meta interleave="true" ordered="true"
+monitor %_:id 30s:60s
 
 primitive dlm ocf:pacemaker:controld
+	op start timeout=90s
+	op stop timeout=100s
 
 primitive clvm ocf:lvm2:clvmd
+	op start timeout=90s
+	op stop timeout=100s
 
 primitive cmirror ocf:lvm2:cmirrord
+	op start timeout=90s
+	op stop timeout=100s
 
 primitive o2cb ocf:ocfs2:o2cb
+	op start timeout=90s
+	op stop timeout=100s
 
-group o2stage dlm clvm o2cb cmirror
-
-clone c-o2stage o2stage meta interleave="true"
-
-colocation colo-%_:id-o2stage inf: c-%_:id c-o2stage
+group g-%_:id dlm clvm o2cb cmirror %_:id
 
-order order-%_:id-o2stage inf: c-o2stage c-%_:id
+clone c-%_:id g-%_:id meta interleave="true"