diff --git a/debian/control b/debian/control
index 427683d163d..20ac61f20a3 100644
--- a/debian/control
+++ b/debian/control
@@ -650,29 +650,12 @@ Description: RocksDB storage engine for MariaDB
  at maximising storage efficiency while maintaining InnoDB-like performance.
  This package contains the RocksDB plugin for MariaDB.
 
-Package: mariadb-columnstore-libs
-Architecture: amd64
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Required libraries for the MariaDB ColumnStore storage engine
-
-Package: mariadb-columnstore-platform
-Architecture: amd64
-Depends: mariadb-columnstore-libs (= ${binary:Version}),
-         expect,
-         net-tools,
-         libsnappy1 | libsnappy1v5,
-         libjemalloc1 | libjemalloc2,
-         libboost-all-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: The platform binaries for MariaDB ColumnStore
-
 Package: mariadb-plugin-columnstore
 Architecture: amd64
 Depends: mariadb-server-10.5 (= ${binary:Version}),
-         mariadb-columnstore-libs (= ${binary:Version}),
-         mariadb-columnstore-platform (= ${binary:Version}),
+         net-tools,
+         libsnappy1 | libsnappy1v5,
+         libjemalloc1 | libjemalloc2,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: python-mysqldb
diff --git a/debian/mariadb-columnstore-platform.postinst b/debian/mariadb-columnstore-platform.postinst
deleted file mode 100644
index ff0145ba572..00000000000
--- a/debian/mariadb-columnstore-platform.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-columnstore-post-install
diff --git a/debian/mariadb-columnstore-platform.postrm b/debian/mariadb-columnstore-platform.postrm
deleted file mode 100644
index 6debedb7bf4..00000000000
--- a/debian/mariadb-columnstore-platform.postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-if [ "$1" = "purge" ]; then
-    rm -rf /var/lib/columnstore
-fi
-
diff --git a/debian/mariadb-columnstore-platform.prerm b/debian/mariadb-columnstore-platform.prerm
deleted file mode 100644
index 6767067cf8f..00000000000
--- a/debian/mariadb-columnstore-platform.prerm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-mcsadmin shutdown
diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install
index ec0204f57ea..0766cea07a8 100644
--- a/debian/mariadb-plugin-columnstore.install
+++ b/debian/mariadb-plugin-columnstore.install
@@ -112,6 +112,7 @@ usr/bin/remote_command.sh
 usr/bin/remote_command_verify.sh
 usr/bin/remote_scp_get.sh
 usr/bin/remote_scp_put.sh
+usr/bin/mcs-stop-controllernode.sh
 usr/bin/remotessh.exp
 usr/bin/reset_locks
 usr/bin/resourceReport.sh
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index 91196607bde..77b33f1c0fc 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit 91196607bde3762f4ab8a479b28213a4eee7130d
+Subproject commit 77b33f1c0fca168dd2bff0837ecb193ea668ed9e