diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
index 971af93c8..4601dab90 100644
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@@ -15,6 +15,7 @@ After every CAPIBM major version release:
 - [ ] [Update release support data in docs](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/docs/book/src/developer/release-support-guidelines.md)
 - [ ] [Update docs with reference to latest release](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/README.md#compatibility-with-cluster-api-and-kubernetes-versions)
 - [ ] Update and add documentation link for new release branch in Netlify
+- [ ] Update capibmadm tool to the latest version after each new release
 - [ ] Add new presubmit job for latest release branch in [kubernetes/test-infra](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/cluster-api-provider-ibmcloud)
     - [ ] Update kubekins-e2e image to relevent Kubernetes version
 - [ ] Add E2E CI jobs for latest release branch in [ppc64le-cloud/test-infra](https://github.com/ppc64le-cloud/test-infra/blob/master/config/jobs/periodic/cluster-api-provider-ibmcloud/test-e2e-capi-ibmcloud-periodics.yaml)
diff --git a/docs/book/src/topics/capibmadm/index.md b/docs/book/src/topics/capibmadm/index.md
index 45ac910e4..36e2130ad 100644
--- a/docs/book/src/topics/capibmadm/index.md
+++ b/docs/book/src/topics/capibmadm/index.md
@@ -4,6 +4,9 @@ Kubernetes Cluster API Provider IBM Cloud Management Utility
 
 ## Install capibmadm
 
+{{#tabs name:"install-ccapibmadm" tabs:"Linux/MacOS,Windows"}}
+{{#tab Linux/MacOS}}
+
 #### Install capibmadm binary with curl on Linux / MacOS
 Run the following command to download the capibmadm binary:
 
@@ -23,6 +26,9 @@ Test to ensure the version you installed is up-to-date:
 capibmadm version -o short
 ```
 
+{{#/tab }}
+{{#tab Windows}}
+
 #### Install capibmadm binary with curl on Windows using PowerShell
 Go to the working directory where you want capibmadm downloaded.
 
@@ -43,5 +49,8 @@ Test to ensure the version you installed is up-to-date:
 capibmadm.exe version -o short
 ```
 
+{{#/tab }}
+{{#/tabs }}
+
 ## [1. PowerVS commands](./powervs/index.md)
 ## [2. VPC commands](./vpc/index.md)
diff --git a/docs/book/theme/css/custom.css b/docs/book/theme/css/custom.css
index c5838cc48..8036fbcfc 100644
--- a/docs/book/theme/css/custom.css
+++ b/docs/book/theme/css/custom.css
@@ -39,3 +39,64 @@ aside.note.warning > h1::before {
     border-radius: 50%;
     border: 2px solid var(--warning-note-color, #f0ad4e);
 }
+
+.tabset > input[type="radio"] {
+  position: absolute;
+  left: -200vw;
+}
+
+.tabset .tab-panel {
+  display: none;
+}
+
+.tabset > input:first-child:checked ~ .tab-panels > .tab-panel:first-child,
+.tabset > input:nth-child(3):checked ~ .tab-panels > .tab-panel:nth-child(2){
+  display: block;
+}
+
+.tabset > label {
+  position: relative;
+  display: inline-block;
+  padding: .6em 1em 1em;
+  border: 1px solid transparent;
+  border-bottom: 0;
+  cursor: pointer;
+  font-size: 16px;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+
+.tabset > label::after {
+  content: "";
+  position: absolute;
+  left: 15px;
+  bottom: 10px;
+  width: 20px;
+  height: 4px;
+  background: #8d8d8d;
+}
+
+.tabset > label:hover,
+.tabset > input:focus + label {
+  color: #06c;
+}
+
+.tabset > label:hover::after,
+.tabset > input:focus + label::after,
+.tabset > input:checked + label::after {
+  background: #06c;
+}
+
+.tabset > input:checked + label {
+  border-color: #ccc;
+  border-bottom: 1px solid #fff;
+  margin-bottom: -1px;
+}
+
+.tab-panel {
+  padding: 1em 1.4em;
+  border: 1px solid #ccc;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  position: relative;
+}
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
index 7f0bb3434..87f9f9e6b 100644
--- a/hack/tools/tools.go
+++ b/hack/tools/tools.go
@@ -34,6 +34,7 @@ import (
 	_ "sigs.k8s.io/cluster-api/hack/tools/conversion-verifier"
 	_ "sigs.k8s.io/cluster-api/hack/tools/mdbook/embed"
 	_ "sigs.k8s.io/cluster-api/hack/tools/mdbook/releaselink"
+	_ "sigs.k8s.io/cluster-api/hack/tools/mdbook/tabulate"
 	_ "sigs.k8s.io/controller-runtime/tools/setup-envtest"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
 	_ "sigs.k8s.io/kustomize/kustomize/v5"