diff --git a/daprdocs/content/en/getting-started/_index.md b/daprdocs/content/en/getting-started/_index.md
index 8330ffd79..f82e9faca 100644
--- a/daprdocs/content/en/getting-started/_index.md
+++ b/daprdocs/content/en/getting-started/_index.md
@@ -22,6 +22,4 @@ The following steps in this guide are:
 1. Configure a component
 1. Explore Dapr quickstarts
 
-{{% alert color="primary" %}}
-[First step: Install the Dapr CLI >>]({{< ref install-dapr-cli.md >}})
-{{% /alert %}}
+{{< button text="First step: Install the Dapr CLI >>" page="install-dapr-cli" >}}
diff --git a/daprdocs/content/en/getting-started/get-started-api.md b/daprdocs/content/en/getting-started/get-started-api.md
index 4683eb918..1e684538d 100644
--- a/daprdocs/content/en/getting-started/get-started-api.md
+++ b/daprdocs/content/en/getting-started/get-started-api.md
@@ -101,6 +101,4 @@ Exit the redis-cli with:
 exit
 ```
 
-{{% alert color="primary" %}}
-[Next step: Define a component >>]({{< ref get-started-component.md >}})
-{{% /alert %}}
+{{< button text="Next step: Define a component >>" page="get-started-component" >}}
diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md
index e64fa18bc..4c026f242 100644
--- a/daprdocs/content/en/getting-started/get-started-component.md
+++ b/daprdocs/content/en/getting-started/get-started-component.md
@@ -90,6 +90,4 @@ You should see output with the secret you stored in the JSON file.
 {"my-secret":"I'm Batman"}
 ```
 
-{{% alert color="primary" %}}
-[Next step: Explore Dapr quickstarts >>]({{< ref quickstarts.md >}})
-{{% /alert %}}
\ No newline at end of file
+{{< button text="Next step: Explore Dapr quickstarts >>" page="quickstarts" >}}
diff --git a/daprdocs/content/en/getting-started/install-dapr-cli.md b/daprdocs/content/en/getting-started/install-dapr-cli.md
index 8da604d0a..30a7cc743 100644
--- a/daprdocs/content/en/getting-started/install-dapr-cli.md
+++ b/daprdocs/content/en/getting-started/install-dapr-cli.md
@@ -110,6 +110,4 @@ Flags:
 Use "dapr [command] --help" for more information about a command.
 ```
 
-{{% alert color="primary" %}}
-[Next step: Initialize Dapr >>]({{< ref install-dapr-selfhost.md >}})
-{{% /alert %}}
\ No newline at end of file
+{{< button text="Next step: Initialize Dapr >>" page="install-dapr-selfhost" >}}
diff --git a/daprdocs/content/en/getting-started/install-dapr-selfhost.md b/daprdocs/content/en/getting-started/install-dapr-selfhost.md
index 218bd826b..8afb8235a 100644
--- a/daprdocs/content/en/getting-started/install-dapr-selfhost.md
+++ b/daprdocs/content/en/getting-started/install-dapr-selfhost.md
@@ -109,6 +109,4 @@ You will see the Dapr config, Dapr binaries directory, and the default component
 
 {{< /tabs >}}
 
-{{% alert color="primary" %}}
-[Next step: Use the Dapr API >>]({{< ref get-started-api.md >}})
-{{% /alert %}}
\ No newline at end of file
+{{< button text="Next step: Use the Dapr API >>" page="get-started-api" >}}