diff --git a/build/buildcvs b/build/buildcvs
index e52eb8891ff404e8d201901942074f1bce354510..a3c8ebc4728d79dad19a43118517722723c175d7 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -171,7 +171,7 @@ case "$lustretag" in
 	;;
 
     # CMD3
-    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_som|b_head_interop_disk)
+    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_som)
         # Update b1_8 above when changing this.
         ldiskfstag="$ldiskfstag_head"
         ;;
@@ -242,7 +242,8 @@ case "$lustretag" in
 
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_HEAD_AT)
+    # b_head_interop_disk: Interoperability server side changes
+    HEAD|b_HEAD_AT|b_head_interop_disk)
         lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
         libcfstag="HEAD"