diff --git a/messages/en-US.json b/messages/en-US.json
index f7d5b5ac..247aa5d6 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1167,7 +1167,7 @@
     "blueprints": "Blueprints",
     "blueprintsDescription": "Blueprints are declarative YAML configurations that define your resources and their settings",
     "blueprintAdd": "Add Blueprint",
-    "blueprintGoBack": "Back to blueprints",
+    "blueprintGoBack": "See all Blueprints",
     "blueprintCreate": "Create blueprint",
     "blueprintCreateDescription2": "Follow the steps below to create and apply a new blueprint",
     "blueprintDetails": "Blueprint details",
diff --git a/src/app/[orgId]/settings/blueprints/[blueprintId]/page.tsx b/src/app/[orgId]/settings/blueprints/[blueprintId]/page.tsx
index e4417467..fe3ae4b9 100644
--- a/src/app/[orgId]/settings/blueprints/[blueprintId]/page.tsx
+++ b/src/app/[orgId]/settings/blueprints/[blueprintId]/page.tsx
@@ -47,18 +47,10 @@ export default async function BluePrintDetailPage(props: BluePrintsPageProps) {
 
     return (
         <>
-            <div className="flex flex-col gap-2 items-start">
-                <Button variant="link" asChild className="gap-1 px-0">
-                    <Link href={`/${params.orgId}/settings/blueprints`}>
-                        <ArrowLeft className="size-4 flex-none" />
-                        {t("blueprintGoBack")}
-                    </Link>
-                </Button>
-                <SettingsSectionTitle
-                    title={t("blueprintDetails")}
-                    description={t("blueprintDetailsDescription")}
-                />
-            </div>
+            <SettingsSectionTitle
+                title={t("blueprintDetails")}
+                description={t("blueprintDetailsDescription")}
+            />
 
             <BlueprintDetailsForm blueprint={blueprint} />
         </>
diff --git a/src/app/[orgId]/settings/blueprints/create/page.tsx b/src/app/[orgId]/settings/blueprints/create/page.tsx
index 3d78289f..e7a0490e 100644
--- a/src/app/[orgId]/settings/blueprints/create/page.tsx
+++ b/src/app/[orgId]/settings/blueprints/create/page.tsx
@@ -24,17 +24,16 @@ export default async function CreateBlueprintPage(
 
     return (
         <>
-            <div className="flex flex-col gap-2 items-start">
-                <Button variant="link" asChild className="gap-1 px-0">
-                    <Link href={`/${orgId}/settings/blueprints`}>
-                        <ArrowLeft className="size-4 flex-none" />{" "}
-                        {t("blueprintGoBack")}
-                    </Link>
-                </Button>
+            <div className="flex gap-2 justify-between">
                 <SettingsSectionTitle
                     title={t("blueprintCreate")}
                     description={t("blueprintCreateDescription2")}
                 />
+                <Button variant="outline" asChild>
+                    <Link href={`/${orgId}/settings/blueprints`}>
+                        {t("blueprintGoBack")}
+                    </Link>
+                </Button>
             </div>
 
             <CreateBlueprintForm orgId={orgId} />