diff --git a/shell/templates/clvm b/shell/templates/clvm
index 9689f0aaa5..615948ddc8 100644
--- a/shell/templates/clvm
+++ b/shell/templates/clvm
@@ -1,41 +1,46 @@
 %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)
 
 %% id 
 
 # The volume group name
 
 %% volgrpname 
 
 %generate
 
 primitive clvm ocf:lvm2:clvmd
-	params daemon_timeout="30" daemon_options="-d2"
+	params daemon_timeout="30"
 
-clone clvm-clone clvm
+primitive cmirror ocf:lvm2:cmirrord
+	params daemon_timeout="30"
+
+group lvm2stage clvm cmirror
+
+clone c-lvm2stage lvm2stage
 	meta interleave="true" ordered="true"
 
 primitive %_:id ocf:heartbeat:LVM
 	params volgrpname="%_:volgrpname"
 
 clone c-%_:id %_:id
 	meta interleave="true" ordered="true"
 
-colocation colo-%_:id-clvm inf: c-%_:id clvm-clone
+colocation colo-%_:id-lvm2stage inf: c-%_:id c-lvm2stage
 
-order order-%_:id-clvm inf: clvm-clone c-%_:id
+order order-%_:id-lvm2stage inf: c-lvm2stage c-%_:id
diff --git a/shell/templates/ocfs2 b/shell/templates/ocfs2
index 53d01e5ed0..e126edcc36 100644
--- a/shell/templates/ocfs2
+++ b/shell/templates/ocfs2
@@ -1,62 +1,64 @@
 %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)
 
 %% 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"
 
 monitor %_:id 20:40
 
 clone c-%_:id %_:id
 	meta interleave="true" ordered="true"
 
 primitive dlm ocf:pacemaker:controld
 
 primitive clvm ocf:lvm2:clvmd
 
+primitive cmirror ocf:lvm2:cmirrord
+
 primitive o2cb ocf:ocfs2:o2cb
 
-group o2stage dlm clvm o2cb
+group o2stage dlm clvm o2cb cmirror
 
 clone c-o2stage o2stage meta interleave="true"
 
 colocation colo-%_:id-o2stage inf: c-%_:id c-o2stage
 
 order order-%_:id-o2stage 0: c-o2stage c-%_:id