diff --git a/CLAUDE.md b/CLAUDE.md
index cd7fb0b2c..8eea6d475 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -80,7 +80,7 @@ Must follow the established template structure:
 ```markdown
 # Sample Title
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-<DIRNAME>-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/<DIRNAME>)
 
 Description of what this sample does.
 
@@ -124,7 +124,7 @@ Languages: python, nodejs, golang, etc.
 - `Tags:` -- Comma-separated; frameworks, tools, categories (NOT programming languages)
 - `Languages:` -- Comma-separated programming languages/runtimes
 
-The 1-click deploy badge URL must use `sample-<DIRNAME>-template` as the `template_name` (this is auto-managed by `template-manager.js`).
+The 1-click deploy badge must link to `https://portal.defang.io/sample/<DIRNAME>` (where `<DIRNAME>` is the sample's directory name). This opens the Defang Portal deploy flow (create project + stack + clone) instead of jumping straight to GitHub's template-creation page.
 
 ### 3. Source code directory (required)
 
diff --git a/samples/agentic-autogen/README.md b/samples/agentic-autogen/README.md
index c9b15eb8f..c41cc2681 100644
--- a/samples/agentic-autogen/README.md
+++ b/samples/agentic-autogen/README.md
@@ -1,6 +1,6 @@
 # Agentic Autogen
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-agentic-autogen-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/agentic-autogen)
 
 This sample shows an agentic Autogen application using Mistral and FastAPI, deployed with Defang. For demonstration purposes, it will require a [Mistral AI](https://mistral.ai/) API key (see [Configuration](#configuration) for more details). However, you are free to modify it to use a different LLM, say the [Defang OpenAI Access Gateway](https://github.com/DefangLabs/openai-access-gateway/) service, as an alternative. Note that the Vite React frontend is served through the FastAPI backend so that they can be treated as one service in production.
  
diff --git a/samples/agentic-langgraph/README.md b/samples/agentic-langgraph/README.md
index 38904eb3c..ec71f5210 100644
--- a/samples/agentic-langgraph/README.md
+++ b/samples/agentic-langgraph/README.md
@@ -1,6 +1,6 @@
 # Agentic LangGraph
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-agentic-langgraph-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/agentic-langgraph)
 
 This sample demonstrates a LangGraph Agent application deployed with Defang. You can customize the agent's tools as needed. For example, it includes a Tavily Search tool for performing search queries, which requires a `TAVILY_API_KEY` (see [Configuration](#configuration) for setup details).
 
diff --git a/samples/agentic-strands/README.md b/samples/agentic-strands/README.md
index 72304594d..a1d8bfe43 100644
--- a/samples/agentic-strands/README.md
+++ b/samples/agentic-strands/README.md
@@ -1,6 +1,6 @@
 # Agentic Strands
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-agentic-strands-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/agentic-strands)
 
 This sample demonstrates a Strands Agent application, deployed with Defang. This [Strands](https://strandsagents.com/latest/) Agent can use tools, and is compatible with the [Defang OpenAI Access Gateway](https://github.com/DefangLabs/openai-access-gateway/).
 
diff --git a/samples/angular-express/README.md b/samples/angular-express/README.md
index 3c2471c0e..0c3886702 100644
--- a/samples/angular-express/README.md
+++ b/samples/angular-express/README.md
@@ -1,6 +1,6 @@
 # Angular & Node.js
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-angular-express-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/angular-express)
 
 This sample demonstrates how to deploy a full-stack Angular and Node.js application with Defang. It uses Socket.IO for real-time communication. The Docker setup ensures the app can be easily built and deployed.
 
diff --git a/samples/arduino-wifi/README.md b/samples/arduino-wifi/README.md
index 3a14ecd9d..657515212 100644
--- a/samples/arduino-wifi/README.md
+++ b/samples/arduino-wifi/README.md
@@ -1,6 +1,6 @@
 # Arduino Flask Wifi Server
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-<arduino-wifi-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/arduino-wifi)
 
 ![project image](./images/wifi.png)
 
diff --git a/samples/bullmq-bullboard-redis/README.md b/samples/bullmq-bullboard-redis/README.md
index 8bf168424..f0d9f8b47 100644
--- a/samples/bullmq-bullboard-redis/README.md
+++ b/samples/bullmq-bullboard-redis/README.md
@@ -1,6 +1,6 @@
 # BullMQ & BullBoard & Redis
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-bullmq-bullboard-redis-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/bullmq-bullboard-redis)
 
 This sample demonstrates how to deploy a BullMQ message queue on top of managed Redis with a queue processor and a dashboard to monitor the queue.
 
diff --git a/samples/crewai/README.md b/samples/crewai/README.md
index 41e7d9bae..78f947efc 100644
--- a/samples/crewai/README.md
+++ b/samples/crewai/README.md
@@ -1,5 +1,7 @@
 # Crew.ai Django Sample
 
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/crewai)
+
 This sample shows how to use Crew.ai with a Django application. It provides a simple web interface that allows users to input text and receive a summary of the text in real-time using Django Channels with a Redis broker. It uses Celery to handle the Crew.ai tasks in the background with Redis as a broker. It uses Postgres as the database for Django.
 
 ## Prerequisites
diff --git a/samples/csharp-dotnet/README.md b/samples/csharp-dotnet/README.md
index f1929cf06..133de341d 100644
--- a/samples/csharp-dotnet/README.md
+++ b/samples/csharp-dotnet/README.md
@@ -1,6 +1,6 @@
 # C# & ASP.NET Core
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-csharp-dotnet-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/csharp-dotnet)
 
 This sample project is a simple task manager application using ASP.NET Core for the backend and JavaScript for client-side component rendering. 
 
diff --git a/samples/defang-provider-handoff/README.md b/samples/defang-provider-handoff/README.md
index 425c2bc55..538a5996f 100644
--- a/samples/defang-provider-handoff/README.md
+++ b/samples/defang-provider-handoff/README.md
@@ -1,5 +1,7 @@
 # Defang Provider Handoff Sample
 
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/defang-provider-handoff)
+
 If you are using Defang to deploy your application into your customer's cloud accounts, you may want to provide a white-labeled static site that your customers can use to configure their cloud account for your deployment. This sample demonstrates how to do that.
 
 The `compose.yaml` file in this directory defines a single service, `app`, which serves a static site on port 80. The static site is built from the `./app` directory, which contains an `index.html` file that provides instructions for the customer on how to configure their cloud account for your deployment.
diff --git a/samples/django-celery/README.md b/samples/django-celery/README.md
index e19d92238..98557d798 100644
--- a/samples/django-celery/README.md
+++ b/samples/django-celery/README.md
@@ -1,6 +1,6 @@
 # Django Celery
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-django-celery-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/django-celery)
 
 This is a sample Django application that uses Celery for background tasks. It uses Postgres as the database and Redis as the message broker.
 
diff --git a/samples/django-postgres/README.md b/samples/django-postgres/README.md
index 20ab21216..afce5f8a0 100644
--- a/samples/django-postgres/README.md
+++ b/samples/django-postgres/README.md
@@ -1,6 +1,6 @@
 # Django & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-django-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/django-postgres)
 
 This template is a customer relationship management list project developed using Python Django framework, offering a starting point to help you quickly build your customer management system. We use PostgreSQL as the database. We have prepared all the essential files for deployment. By spending less than 10 minutes setting up the environment, as detailed in the prerequisites, and executing the commands in our step-by-step guide, your website will be ready to go live to the world!
 
diff --git a/samples/django-railpack/README.md b/samples/django-railpack/README.md
index 8cc56b3e3..8d0a8b46b 100644
--- a/samples/django-railpack/README.md
+++ b/samples/django-railpack/README.md
@@ -1,6 +1,6 @@
 # Django-Railpack
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-django-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/django-railpack)
 
 This sample is a simple Django to-do app that uses SQLite as the database, which will be reset every time you deploy. **It is not production-ready**. For production use cases, you should check out the Django + Postgres sample.
 
diff --git a/samples/django-redis-postgres/README.md b/samples/django-redis-postgres/README.md
index 14bb41bfb..e1dc030d6 100644
--- a/samples/django-redis-postgres/README.md
+++ b/samples/django-redis-postgres/README.md
@@ -1,6 +1,6 @@
 # Django Channels & Redis & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-django-channels-redis-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/django-redis-postgres)
 
 This sample demonstrates how to get Django Channels up and running with Redis and Postgres both managed by Defang. It demonstrates how to do this with a simple chat application.
 
diff --git a/samples/django/README.md b/samples/django/README.md
index b37825bc4..822cf6a9d 100644
--- a/samples/django/README.md
+++ b/samples/django/README.md
@@ -1,6 +1,6 @@
 # Django
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-django-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/django)
 
 This sample is a simple Django to-do app that uses SQLite as the database, which will be reset every time you deploy. **It is not production-ready**. For production use cases, you should check out the Django + Postgres sample.
 
diff --git a/samples/elysia/README.md b/samples/elysia/README.md
index bd6f8c8db..ad9c216d6 100644
--- a/samples/elysia/README.md
+++ b/samples/elysia/README.md
@@ -1,6 +1,6 @@
 # Elysia & Bun
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-elysia-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/elysia)
 
 A basic [Elysia](https://elysiajs.com/) app running on [Bun](https://bun.sh/) with a Dockerfile and compose.yaml ready to deploy to AWS with [Defang](https://defang.io).
 
diff --git a/samples/fastapi-postgres-pubsub/README.md b/samples/fastapi-postgres-pubsub/README.md
index f3d06218a..377d0cc1f 100644
--- a/samples/fastapi-postgres-pubsub/README.md
+++ b/samples/fastapi-postgres-pubsub/README.md
@@ -1,6 +1,6 @@
 # FastAPI Postgres Pub/Sub Chat
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-fastapi-postgres-pubsub-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/fastapi-postgres-pubsub)
 
 This sample pairs FastAPI with PostgreSQL `LISTEN/NOTIFY` to demonstrate real-time updates between two application containers. A minimal chat UI sends messages with a REST request, and both FastAPI instances broadcast the new message over WebSockets after Postgres notifies them.
 
diff --git a/samples/fastapi-postgres/README.md b/samples/fastapi-postgres/README.md
index 651d69964..72f9ccddd 100644
--- a/samples/fastapi-postgres/README.md
+++ b/samples/fastapi-postgres/README.md
@@ -1,6 +1,6 @@
 # FastAPI & PostgreSQL
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-fastapi-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/fastapi-postgres)
 
 This sample project demonstrates how to deploy FastAPI with PostgreSQL with Defang.
 
diff --git a/samples/fastapi/README.md b/samples/fastapi/README.md
index acb44f1ec..fbdaf8b51 100644
--- a/samples/fastapi/README.md
+++ b/samples/fastapi/README.md
@@ -1,6 +1,6 @@
 # FastAPI
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-fastapi-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/fastapi)
 
 This sample project demonstrates how to deploy FastAPI with Defang.
 
diff --git a/samples/feathersjs/README.md b/samples/feathersjs/README.md
index d179b2cef..9191945c4 100644
--- a/samples/feathersjs/README.md
+++ b/samples/feathersjs/README.md
@@ -2,7 +2,7 @@
 
 This sample project demonstrates how to deploy a FeathersJS application on to AWS using Defang. We also demonstrate how to run the application in both development and production environments using Docker Compose.
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-feathersjs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/feathersjs)
 
 ## Prerequisites
 
diff --git a/samples/flask-railpack/README.md b/samples/flask-railpack/README.md
index 0a19c9e80..3cce3f1ec 100644
--- a/samples/flask-railpack/README.md
+++ b/samples/flask-railpack/README.md
@@ -1,6 +1,6 @@
 # Flask-Railpack
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-flask-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/flask-railpack)
 
 This is a basic Flask to-do app that can be deployed with Defang. Note that alongside your `.py` file, include a `requirements.txt` so that the [Railpack](https://railpack.com/) can install the necessary packages with pip.
 
diff --git a/samples/flask/README.md b/samples/flask/README.md
index 21620310e..3fe41a2b5 100644
--- a/samples/flask/README.md
+++ b/samples/flask/README.md
@@ -1,6 +1,6 @@
 # Flask
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-flask-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/flask)
 
 This is a basic Flask to-do app that can be deployed with Defang.  Note that alongside your `.py` file, include a `requirements.txt` so that the Dockerfile can install the necessary packages with pip.
 
diff --git a/samples/golang-http-form/README.md b/samples/golang-http-form/README.md
index e49a40ff2..4700f01d8 100644
--- a/samples/golang-http-form/README.md
+++ b/samples/golang-http-form/README.md
@@ -1,6 +1,6 @@
 # Go HTTP Form
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-http-form-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-http-form)
 
 This Go application demonstrates a simple form submission using the standard net/http library. Users can input their first name into a form, and upon submission, they will be greeted personally by the application.
 
diff --git a/samples/golang-http/README.md b/samples/golang-http/README.md
index 990d10368..011e17ccf 100644
--- a/samples/golang-http/README.md
+++ b/samples/golang-http/README.md
@@ -1,6 +1,6 @@
 # Go HTTP Server
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-http-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-http)
 
 A very simple example of a Go service that listens on a port and returns information about the request.
 
diff --git a/samples/golang-mongodb/README.md b/samples/golang-mongodb/README.md
index 7c8e8cf66..b8acd03d4 100644
--- a/samples/golang-mongodb/README.md
+++ b/samples/golang-mongodb/README.md
@@ -1,6 +1,6 @@
 # Go & MongoDB
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-mongodb-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-mongodb)
 
 This sample is a task manager application that uses Go and MongoDB, deployed with Defang.
 
diff --git a/samples/golang-openai/README.md b/samples/golang-openai/README.md
index c05334e41..9e6427d04 100644
--- a/samples/golang-openai/README.md
+++ b/samples/golang-openai/README.md
@@ -1,6 +1,6 @@
 # Golang & OpenAI
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-openai-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-openai)
 
 This sample demonstrates how to deploy a Go project with OpenAI using Defang.
 
diff --git a/samples/golang-railpack/README.md b/samples/golang-railpack/README.md
index e1f788363..7ae662d70 100644
--- a/samples/golang-railpack/README.md
+++ b/samples/golang-railpack/README.md
@@ -1,6 +1,6 @@
 # Golang-Http-Form-Railpack
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-http-form-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-railpack)
 
 This Go application demonstrates a simple form submission using the standard net/http library. Users can input their first name into a form, and upon submission, they will be greeted personally by the application.
 
diff --git a/samples/golang-rest-api/README.md b/samples/golang-rest-api/README.md
index 7be3c76fb..33f68a219 100644
--- a/samples/golang-rest-api/README.md
+++ b/samples/golang-rest-api/README.md
@@ -1,6 +1,6 @@
 # Go & REST API
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-rest-api-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-rest-api)
 
 This sample shows a Go HTTP server that uses a REST API to fetch data, deployed using Defang. 
 
diff --git a/samples/golang-s3/README.md b/samples/golang-s3/README.md
index 7ee4c49cd..acde83ba8 100644
--- a/samples/golang-s3/README.md
+++ b/samples/golang-s3/README.md
@@ -1,6 +1,6 @@
 # Go & S3
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-s3-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-s3)
 
 This sample shows a simple Go application that uploads and downloads files from AWS S3, deployed with Defang.
 
diff --git a/samples/golang-slackbot/README.md b/samples/golang-slackbot/README.md
index b3247189a..29359c5d2 100644
--- a/samples/golang-slackbot/README.md
+++ b/samples/golang-slackbot/README.md
@@ -1,6 +1,6 @@
 # Go & Slack API
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-golang-slackbot-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/golang-slackbot)
 
 This is a simple Slackbot that takes a request and posts the message from the body to a Slack channel.
 
diff --git a/samples/google-adk/README.md b/samples/google-adk/README.md
index 312d4d701..69a173cd7 100644
--- a/samples/google-adk/README.md
+++ b/samples/google-adk/README.md
@@ -1,6 +1,6 @@
 # Google ADK Sample
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-google-adk-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/google-adk)
 
 This is a simple sample demonstrating how to deploy agents build with Google ADK to Defang.
 
diff --git a/samples/hasura/README.md b/samples/hasura/README.md
index fd24397fa..dddd2e938 100644
--- a/samples/hasura/README.md
+++ b/samples/hasura/README.md
@@ -1,6 +1,6 @@
 # Hasura & PostgreSQL
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-hasura-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/hasura)
 
 This sample project demonstrates how to deploy Hasura with Defang and connect it to a Postgres database. 
 
diff --git a/samples/html-css-js/README.md b/samples/html-css-js/README.md
index 63ee91c72..20b7f7a50 100644
--- a/samples/html-css-js/README.md
+++ b/samples/html-css-js/README.md
@@ -1,6 +1,6 @@
 # HTML & CSS & JavaScript
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-html-css-javascript-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/html-css-js)
 
 This sample shows how to get a static HTML, CSS and JavaScript website up and running with Defang.
 
diff --git a/samples/huginn/README.md b/samples/huginn/README.md
index 2b4cd3e65..7faee75b3 100644
--- a/samples/huginn/README.md
+++ b/samples/huginn/README.md
@@ -1,6 +1,6 @@
 # Huginn
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-huginn-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/huginn)
 
 This sample shows how to deploy Huginn with Defang.
 
diff --git a/samples/imgproxy/README.md b/samples/imgproxy/README.md
index 0b3a57ae1..f02276cf0 100644
--- a/samples/imgproxy/README.md
+++ b/samples/imgproxy/README.md
@@ -1,6 +1,6 @@
 # ImgProxy
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-imgproxy-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/imgproxy)
 
 This sample shows how to deploy ImgProxy with Defang. ImgProxy is a fast and secure standalone server for resizing and converting remote images. It can be deployed using the official Docker image, as documented [here](https://docs.imgproxy.net/installation#docker).
 
diff --git a/samples/javalin/README.md b/samples/javalin/README.md
index c86db7f21..78e6093a4 100644
--- a/samples/javalin/README.md
+++ b/samples/javalin/README.md
@@ -1,6 +1,6 @@
 # Javalin Sample
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-javalin-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/javalin)
 
 This sample demonstrates how to deploy a very basic Javalin sample with Defang. The sample simply outputs "Defang x Javalin" on the webpage.
 
diff --git a/samples/jupyter-postgres/README.md b/samples/jupyter-postgres/README.md
index 3c9e1b3a6..77788362c 100644
--- a/samples/jupyter-postgres/README.md
+++ b/samples/jupyter-postgres/README.md
@@ -1,6 +1,6 @@
 # Jupyter & Postgres
 
-[![1-click-deploy](https://defang.io/deploy-with-defang.png)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-jupyter-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://defang.io/deploy-with-defang.png)](https://portal.defang.io/sample/jupyter-postgres)
 
 This sample shows you how to spin up a postgres database and a Jupyter notebook server. This is useful if you need to use Jupyter notebooks to read data from or persist data to a database.
 
diff --git a/samples/langchain/README.md b/samples/langchain/README.md
index 11f5b7cd2..5c7e4e7d2 100644
--- a/samples/langchain/README.md
+++ b/samples/langchain/README.md
@@ -1,6 +1,6 @@
 # Langchain & Flask
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-langchain-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/langchain)
 
 This sample is an endpoint that tells programming jokes and shows how to deploy a flask app that uses Langchain on to AWS via Defang.
 
diff --git a/samples/managed-llm-provider/README.md b/samples/managed-llm-provider/README.md
index 3eef4ecc7..e981245d7 100644
--- a/samples/managed-llm-provider/README.md
+++ b/samples/managed-llm-provider/README.md
@@ -1,6 +1,6 @@
 # Managed LLM with Docker Model Provider
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-managed-llm-provider-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/managed-llm-provider)
 
 This sample application demonstrates using Managed LLMs with a Docker Model Provider, deployed with Defang.
 
diff --git a/samples/managed-llm/README.md b/samples/managed-llm/README.md
index 74fb2df25..244f77163 100644
--- a/samples/managed-llm/README.md
+++ b/samples/managed-llm/README.md
@@ -1,6 +1,6 @@
 # Managed LLM
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-managed-llm-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/managed-llm)
 
 This sample application demonstrates the use of OpenAI-compatible Managed LLMs (Large Language Models) with Defang.
 
diff --git a/samples/mastra-extended/README.md b/samples/mastra-extended/README.md
index dcba382f9..d24511750 100644
--- a/samples/mastra-extended/README.md
+++ b/samples/mastra-extended/README.md
@@ -1,6 +1,6 @@
 # Mastra Extended
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-mastra-extended-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/mastra-extended)
 
 This sample shows a multi-service AI app built with [Mastra](https://mastra.ai/), Next.js, PostgreSQL (with pgvector), Redis, and BullMQ, deployed with Defang from a single Docker Compose file.
 
diff --git a/samples/mastra-nextjs/README.md b/samples/mastra-nextjs/README.md
index d61d24572..df5c78919 100644
--- a/samples/mastra-nextjs/README.md
+++ b/samples/mastra-nextjs/README.md
@@ -1,6 +1,6 @@
 # Mastra and Next.js Sample
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-mastra-nextjs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/mastra-nextjs)
 
 This sample shows how to deploy an AI-powered GitHub repository chat tool using [Mastra](https://mastra.ai/), a TypeScript AI framework. Mastra-nextjs allows you to chat with and understand any GitHub repository by fetching file trees, contents, pull requests, and issues, making it easy to navigate and understand codebases of any size.
 
diff --git a/samples/mcp/README.md b/samples/mcp/README.md
index 7a4522360..cbf0f64ff 100644
--- a/samples/mcp/README.md
+++ b/samples/mcp/README.md
@@ -1,6 +1,6 @@
 # MCP
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-mcp-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/mcp)
 
 This is a sample of a Model Context Protocol (MCP) chatbot application built with Next.js, Python, and Anthropic Claude, deployed using Defang. 
 
diff --git a/samples/metabase/README.md b/samples/metabase/README.md
index 42ef48bf2..2c3acfc41 100644
--- a/samples/metabase/README.md
+++ b/samples/metabase/README.md
@@ -1,6 +1,6 @@
 # Metabase & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-metabase-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/metabase)
 
 Metabase is a simple and powerful analytics tool which lets anyone learn and make decisions from their company’s data. This sample demonstrates how to deploy Metabase with Defang. In development, we run a postgres container and in production, we use a managed postgres service. To build the sample, we used Neon, because of their simplicity and generous free tier.
 
diff --git a/samples/n8n/README.md b/samples/n8n/README.md
index 9de1a639c..b768953d0 100644
--- a/samples/n8n/README.md
+++ b/samples/n8n/README.md
@@ -1,6 +1,6 @@
 # n8n
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-n8n-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/n8n)
 
 This sample shows how to get a [n8n](https://n8n.io/) app up using PostgreSQL as a database and running with Defang. We based it in part on the [original sample](https://github.com/n8n-io/n8n-hosting/tree/main/docker-compose/withPostgres) from the n8n team, but we have adapted it to be consistent with the way our other samples are configured.
 
diff --git a/samples/nextjs-blog/README.md b/samples/nextjs-blog/README.md
index 174bdedf6..2d5b0d267 100644
--- a/samples/nextjs-blog/README.md
+++ b/samples/nextjs-blog/README.md
@@ -1,6 +1,6 @@
 # Next.js Blog
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-blog-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-blog)
 
 This template is a starter project developed using Next.js designed to make it easy to launch a blog. It offers an excellent starting point to help you publish your content by simply modifying the MDX files included in `_posts` directory. We have prepared all the necessary files for deployment. By spending just a few minutes setting up the environment, as detailed in the prerequisites, and executing the commands in our step-by-step guide, your website will be ready to go live in no time!
 
diff --git a/samples/nextjs-claude/README.md b/samples/nextjs-claude/README.md
index c1f2aa80d..349a5cf5d 100644
--- a/samples/nextjs-claude/README.md
+++ b/samples/nextjs-claude/README.md
@@ -1,6 +1,6 @@
 # Next.js & Claude
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-claude-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-claude)
 
 This sample shows a Next.js and Claude application deployed using Defang. It uses Anthropic API for its chatbot functionality.
 
diff --git a/samples/nextjs-cv/README.md b/samples/nextjs-cv/README.md
index e4227ec8d..564fa4515 100644
--- a/samples/nextjs-cv/README.md
+++ b/samples/nextjs-cv/README.md
@@ -1,6 +1,6 @@
 # Next.js CV
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-cv-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-cv)
 
 This is a sample of a Next.js CV web application, deployed with Defang. 
 
diff --git a/samples/nextjs-documentation/README.md b/samples/nextjs-documentation/README.md
index cc2528a04..21e3087c1 100644
--- a/samples/nextjs-documentation/README.md
+++ b/samples/nextjs-documentation/README.md
@@ -1,6 +1,6 @@
 # Nextra
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-documentation-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-documentation)
 
 This template is a documentation starter project developed using Nextra, designed to streamline the creation of your documentation and quickly build a digital knowledgebase. You can add content easily by simply adding markdown files. This code-free solution requires no adjustments to the basic structure. We have prepared all the essential files for deployment. By spending just a few minutes setting up the environment, as detailed in the prerequisites, and executing the commands in our step-by-step guide, your website will be ready to go live in no time!
 
diff --git a/samples/nextjs-postgres/README.md b/samples/nextjs-postgres/README.md
index 0dc8a7584..a804be7e6 100644
--- a/samples/nextjs-postgres/README.md
+++ b/samples/nextjs-postgres/README.md
@@ -1,6 +1,6 @@
 # Next.js & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-postgres)
 
 This is a sample Next.js application that uses Postgres as a database. It is a simple example that demonstrates how to connect to a Postgres database from a Next.js application: on each request it takes the user's IP address, geo-locates it, and stores the result in the database, then displays the last 20 results on the home page.
 
diff --git a/samples/nextjs-railpack/README.md b/samples/nextjs-railpack/README.md
index 881088217..c517aaf5f 100644
--- a/samples/nextjs-railpack/README.md
+++ b/samples/nextjs-railpack/README.md
@@ -1,6 +1,6 @@
 # Next.js-Railpack
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs-railpack)
 
 A simple Next.js app with a compose.yaml, ready to deploy to AWS using [Defang](https://defang.io). The container image is automatically built by [Railpack](https://railpack.com/).
 
diff --git a/samples/nextjs/README.md b/samples/nextjs/README.md
index 09165defc..ad28468c1 100644
--- a/samples/nextjs/README.md
+++ b/samples/nextjs/README.md
@@ -1,6 +1,6 @@
 # Next.js
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nextjs)
 
 A basic Next.js app with a Dockerfile and compose.yaml ready to deploy to AWS with [Defang](https://defang.io).
 
diff --git a/samples/nocodb/README.md b/samples/nocodb/README.md
index da0797c17..e691c96e2 100644
--- a/samples/nocodb/README.md
+++ b/samples/nocodb/README.md
@@ -1,6 +1,6 @@
 # NocoDB
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nocodb-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nocodb)
 
 This sample demonstrates how to deploy a Nocodb instance with Defang. It's an open source alternative to AirTable, that makes it easy to organize and manage data.
 
diff --git a/samples/nodejs-chatroom/README.md b/samples/nodejs-chatroom/README.md
index 248ed2c6e..4805f4345 100644
--- a/samples/nodejs-chatroom/README.md
+++ b/samples/nodejs-chatroom/README.md
@@ -1,6 +1,6 @@
 # Node.js & SocketIO
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-chatroom-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-chatroom)
 
 This is a minimal chat application that shows how to use Socket.IO with Node.js with minimal code deployed with Defang.
 
diff --git a/samples/nodejs-express/README.md b/samples/nodejs-express/README.md
index 1a9e6b0ba..8544b33de 100644
--- a/samples/nodejs-express/README.md
+++ b/samples/nodejs-express/README.md
@@ -1,6 +1,6 @@
 # Node.js & Express
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-express-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-express)
 
 This Node.js application, built with Express.js, is designed to inspect and display detailed information about incoming HTTP requests. It supports all HTTP methods and provides insights into the request path, method, headers, query parameters, and body. Note alongside your project, you should also include a package.json file that includes the relevant metadata such as package dependencies, scripts, project verrsions so that the Dockerfile can install necessary dependencies.
 
diff --git a/samples/nodejs-form/README.md b/samples/nodejs-form/README.md
index 94473c551..3f966d7e9 100644
--- a/samples/nodejs-form/README.md
+++ b/samples/nodejs-form/README.md
@@ -1,6 +1,6 @@
 # Node.js Express Form
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-form-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-form)
 
 This is a basic Node.js application using the Express framework to demonstrate handling a form submission. The application serves an HTML form where users can input their first name and then greets them personally upon submission.
 
diff --git a/samples/nodejs-http/README.md b/samples/nodejs-http/README.md
index 591a317fe..3b6ba9b10 100644
--- a/samples/nodejs-http/README.md
+++ b/samples/nodejs-http/README.md
@@ -1,6 +1,6 @@
 # Node.js HTTP Server
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-http-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-http)
 
 This example shows how to build a minimal Node.js application using the [Node.js](https://nodejs.org/) runtime.
 
diff --git a/samples/nodejs-openai/README.md b/samples/nodejs-openai/README.md
index 24986f2dc..5d4485638 100644
--- a/samples/nodejs-openai/README.md
+++ b/samples/nodejs-openai/README.md
@@ -1,6 +1,6 @@
 # Node.js & OpenAI
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-openai-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-openai)
 
 A simple Node.js and OpenAI app deployed using Defang.
 
diff --git a/samples/nodejs-react-postgres/README.md b/samples/nodejs-react-postgres/README.md
index 647af5f15..6059fbc57 100644
--- a/samples/nodejs-react-postgres/README.md
+++ b/samples/nodejs-react-postgres/README.md
@@ -1,6 +1,6 @@
 # Node.js & React & PostgreSQL
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-react-postgres-template%26template_owner%3DDefangSamples)`
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-react-postgres)`
 
 This sample project demonstrates how to deploy a full-stack application using React for the frontend, Node.js for the backend, and PostgreSQL for the database. 
 
diff --git a/samples/nodejs-rest-api/README.md b/samples/nodejs-rest-api/README.md
index 7341ff760..3f0e402eb 100644
--- a/samples/nodejs-rest-api/README.md
+++ b/samples/nodejs-rest-api/README.md
@@ -1,6 +1,6 @@
 # Node.js & REST API
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-rest-api-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-rest-api)
 
 This is a simple Node.js application that uses Express.js to create a REST API. It has two endpoints: one that returns a status message, and another that fetches and returns average interest rates data from the U.S. Department of the Treasury's Fiscal Data API.
 
diff --git a/samples/nodejs-s3/README.md b/samples/nodejs-s3/README.md
index a8d459f72..681cbbf77 100644
--- a/samples/nodejs-s3/README.md
+++ b/samples/nodejs-s3/README.md
@@ -1,6 +1,6 @@
 # Node.js & S3
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nodejs-s3-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nodejs-s3)
 
 A simple Node.js and AWS S3 app deployed using Defang.
 
diff --git a/samples/nounly/README.md b/samples/nounly/README.md
index 78c573d83..51061ee48 100644
--- a/samples/nounly/README.md
+++ b/samples/nounly/README.md
@@ -1,6 +1,6 @@
 # Nounly
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nounly-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/nounly)
 
 Nounly (also known as Noun.ly) is a URL shortener website built with Go, JavaScript and Redis, and can be deployed with Defang as a sample.
 
diff --git a/samples/ollama/README.md b/samples/ollama/README.md
index 0bbf54c83..d57b7743e 100644
--- a/samples/ollama/README.md
+++ b/samples/ollama/README.md
@@ -1,6 +1,6 @@
 # Ollama
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-ollama-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/ollama)
 
 This sample demonstrates how to deploy [Ollama](https://ollama.com/) with Defang, along with a Next.js frontend using the [AI SDK](https://www.npmjs.com/package/ai) for smooth streaming conversations. By default it runs a very small model (`llama3.2:1b`) which can perform well with just a CPU, but we've included lines that you can uncomment in the compose file to enable GPU support and run a larger model like `gemma:7b`. If you want to deploy to a GPU powered instance, you will need to use your own AWS account with [Defang BYOC](https://docs.defang.io/docs/concepts/defang-byoc).
 
diff --git a/samples/phoenix-postgres/README.md b/samples/phoenix-postgres/README.md
index 2d1b2ed6f..3465721cb 100644
--- a/samples/phoenix-postgres/README.md
+++ b/samples/phoenix-postgres/README.md
@@ -1,6 +1,6 @@
 # Phoenix & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-phoenix-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/phoenix-postgres)
 
 Defang is the easiest way to deploy containerized apps like this Phoenix + Postgres sample to AWS. This is a sample Phoenix application that uses a PostgreSQL database. The sample doesn't add anything to the database, but is based off of the default Phoenix getting started instructions which add a postgres database to the application.
 
diff --git a/samples/platformatic/README.md b/samples/platformatic/README.md
index 335b6b61c..e30ed9f35 100644
--- a/samples/platformatic/README.md
+++ b/samples/platformatic/README.md
@@ -1,5 +1,7 @@
 # Platformatic App
 
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/platformatic)
+
 This sample project demonstrates how to deploy a simplist Platformatic service that returns "Platformatic x Defang" when accessed. The project includes a Dockerized setup with Docker Compose, making it easy to deploy and manage the service.
 
 Once your app is up and running, you can access it via the defined port (default is 3042). This service is designed to be simple, showcasing how to set up a basic Platformatic application and deploy it using Docker.
diff --git a/samples/pulumi-remix-postgres/README.md b/samples/pulumi-remix-postgres/README.md
index 9edf49586..efb8ab2a0 100644
--- a/samples/pulumi-remix-postgres/README.md
+++ b/samples/pulumi-remix-postgres/README.md
@@ -1,6 +1,6 @@
 # Pulumi & Remix & Postgres
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-pulumi-remix-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/pulumi-remix-postgres)
 
 In this example, we run a Remix application connected to a Postgres database using Prisma as an ORM. When we deploy our service to [Defang](https://defang.io/), we also deploy a Postgres service and database using [Aiven](https://aiven.io/) so we can run our full application in the cloud.
 
diff --git a/samples/pulumi/README.md b/samples/pulumi/README.md
index 003b9570e..1ad43b3eb 100644
--- a/samples/pulumi/README.md
+++ b/samples/pulumi/README.md
@@ -1,6 +1,6 @@
 # Pulumi
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-pulumi-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/pulumi)
 
 This basic example shows you how to use the Defang Pulumi provider to deploy the nodejs-http sample with Defang.
 
diff --git a/samples/python-form/README.md b/samples/python-form/README.md
index 179080ac5..2bf8ea024 100644
--- a/samples/python-form/README.md
+++ b/samples/python-form/README.md
@@ -1,6 +1,6 @@
 # Flask & Form Submission
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-form-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-form)
 
 This Flask application provides a basic example of handling form submissions. It displays an HTML form where users can input their first name. Upon submission, the application greets the user by name on a new page. Note that alognside your .py file, include a requirements.txt so that the Dockerfile can install the necessary packages with pip.
 
diff --git a/samples/python-implicit-gpu/README.md b/samples/python-implicit-gpu/README.md
index d200b823b..5e04110ff 100644
--- a/samples/python-implicit-gpu/README.md
+++ b/samples/python-implicit-gpu/README.md
@@ -1,6 +1,6 @@
 # Python & Implicit & GPU
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-implicit-gpu-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-implicit-gpu)
 
 This Music Recommendation API provides artist recommendations based on collaborative filtering using the Alternating Least Squares (ALS) algorithm from the implicit library. The dataset utilized is from Last.fm. Note that alongside your .py file, include a requirements.txt so that the Dockerfile can install the necessary packages with pip. It demonstrates how to use a GPU with Python and the implicit library with Defang.
 
diff --git a/samples/python-minimal/README.md b/samples/python-minimal/README.md
index 8a894d094..2a0775103 100644
--- a/samples/python-minimal/README.md
+++ b/samples/python-minimal/README.md
@@ -1,6 +1,6 @@
 # Python & Flask & HTTP
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-minimal-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-minimal)
 
 This Flask application is designed to inspect and return detailed information about HTTP requests. It supports both GET and POST methods, providing insights into the request path, method, headers, query parameters, and body. Note that alognside your .py file, include a requirements.txt so that the Dockerfile can install the necessary packages with pip.
 
diff --git a/samples/python-openai/README.md b/samples/python-openai/README.md
index 88023a2bc..a6283106f 100644
--- a/samples/python-openai/README.md
+++ b/samples/python-openai/README.md
@@ -1,6 +1,6 @@
 # Python & Flask & OpenAI
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-openai-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-openai)
 
 ## Setup
 
diff --git a/samples/python-rest-api/README.md b/samples/python-rest-api/README.md
index a2af09b60..b6618bd31 100644
--- a/samples/python-rest-api/README.md
+++ b/samples/python-rest-api/README.md
@@ -1,6 +1,6 @@
 # Python & REST API
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-rest-api-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-rest-api)
 
 This Flask application fetches average interest rates from the Fiscal Data Treasury API. It provides endpoints to check the status of the API and to retrieve the latest average interest rates. Note that alognside your .py file, include a requirements.txt so that the Dockerfile can install the necessary packages with pip.
 
diff --git a/samples/python-s3/README.md b/samples/python-s3/README.md
index b19ee2273..5ce1fe54d 100644
--- a/samples/python-s3/README.md
+++ b/samples/python-s3/README.md
@@ -1,6 +1,6 @@
 # Python & Flask & AWS S3
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-python-s3-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/python-s3)
 
 This sample requires an API key to access AWS S3. The name of the config values is referenced in the compose.yaml file.
 To provide a value for it, you can use the Defang CLI like this:
diff --git a/samples/rails/README.md b/samples/rails/README.md
index 8fae37639..b5b98955f 100644
--- a/samples/rails/README.md
+++ b/samples/rails/README.md
@@ -1,6 +1,6 @@
 # Ruby on Rails
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-rails-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/rails)
 
 This template is a member list project developed using Ruby on Rails, offering a starting point to help you quickly build your team management system. We have prepared all the essential files for deployment. By spending less than 10 minutes setting up the environment, as detailed in the prerequisites, and executing the commands in our step-by-step guide, your website will be ready to go live to the world!
 
diff --git a/samples/react-vite-railpack/README.md b/samples/react-vite-railpack/README.md
index 84335395c..56ffca317 100644
--- a/samples/react-vite-railpack/README.md
+++ b/samples/react-vite-railpack/README.md
@@ -1,6 +1,6 @@
 # React-Vite-Railpack
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-react-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/react-vite-railpack)
 
 This sample shows how to get a simple React app up and running with Defang.
 It includes Vite and ESLint, which are common build tools for React development. The container image is automatically built by [Railpack](https://railpack.com/).
diff --git a/samples/react/README.md b/samples/react/README.md
index cf387afba..1587d14ff 100644
--- a/samples/react/README.md
+++ b/samples/react/README.md
@@ -1,6 +1,6 @@
 # React
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-react-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/react)
 
 This sample shows how to get a simple React app up and running with Defang. 
 It includes Vite and ESLint, which are common build tools for React development. 
diff --git a/samples/redis-js/README.md b/samples/redis-js/README.md
index e20bb8271..99da30663 100644
--- a/samples/redis-js/README.md
+++ b/samples/redis-js/README.md
@@ -1,5 +1,5 @@
 # Redis & JavaScript
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-redis-js-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/redis-js)
 
 This is a Redis and JavaScript application, deployed with Defang. 
 
diff --git a/samples/rocket/README.md b/samples/rocket/README.md
index 1b48ca46e..02fccc72f 100644
--- a/samples/rocket/README.md
+++ b/samples/rocket/README.md
@@ -1,6 +1,6 @@
 # Rocket
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-rocket-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/rocket)
 
 This sample demonstrates how to deploy a very simple Rocket app. Rocket is a web framework for Rust.
 
diff --git a/samples/sailsjs-postgres/README.md b/samples/sailsjs-postgres/README.md
index 14aaf8033..3a87c1e21 100644
--- a/samples/sailsjs-postgres/README.md
+++ b/samples/sailsjs-postgres/README.md
@@ -1,6 +1,6 @@
 # Sails.js & PostgreSQL
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-sailsjs-postgres-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/sailsjs-postgres)
 
 This sample project demonstrates how to deploy
 
diff --git a/samples/sailsjs/README.md b/samples/sailsjs/README.md
index 124f5ac99..bea5ce6ff 100644
--- a/samples/sailsjs/README.md
+++ b/samples/sailsjs/README.md
@@ -1,6 +1,6 @@
 # Sailsjs
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-sailsjs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/sailsjs)
 
 This sample demosntrates how to deploy a very basic Sailsjs sample with Defang. The sample simply outputs hello world on the webpage.
 
diff --git a/samples/self-improving-mastra/README.md b/samples/self-improving-mastra/README.md
index ff99618fa..53273fdfe 100644
--- a/samples/self-improving-mastra/README.md
+++ b/samples/self-improving-mastra/README.md
@@ -1,6 +1,6 @@
 # Self-Improving Mastra Todo
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-self-improving-mastra-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/self-improving-mastra)
 
 This sample is a multi-user Next.js todo app that turns user feedback into live
 code changes. Better Auth and PostgreSQL provide accounts, private todo lists,
diff --git a/samples/svelte-mysql/README.md b/samples/svelte-mysql/README.md
index e7973c386..cb38cacaf 100644
--- a/samples/svelte-mysql/README.md
+++ b/samples/svelte-mysql/README.md
@@ -1,6 +1,6 @@
 # Svelte & Node.js & MySQL
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-svelte-mysql-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/svelte-mysql)
 
 This sample project demonstrates how to deploy a full-stack application using Svelte for the frontend, Node.js for the backend, and MySQL for the database. The project uses Docker to containerize the services, making it easy to run in both development and production environments.
 
diff --git a/samples/sveltekit-mongodb/README.md b/samples/sveltekit-mongodb/README.md
index 545694eaa..8346f8253 100644
--- a/samples/sveltekit-mongodb/README.md
+++ b/samples/sveltekit-mongodb/README.md
@@ -1,6 +1,6 @@
 # Sveltekit & MongoDB
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-sveltekit-mongodb-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/sveltekit-mongodb)
 
 This is a project that demonstrate both client side component rendering and hydration as well as serverside rendering with external API route configuration. Furthermore, there is also a mongodb connection (not hosted on the atlas) to cache the queried results.
 
diff --git a/samples/sveltekit/README.md b/samples/sveltekit/README.md
index 49b0c2734..7d73a067c 100644
--- a/samples/sveltekit/README.md
+++ b/samples/sveltekit/README.md
@@ -1,6 +1,6 @@
 # Sveltekit
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-sveltekit-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/sveltekit)
 
 This sample shows how to get a minimal SvelteKit app up and running with Defang.
 
diff --git a/samples/vllm/README.md b/samples/vllm/README.md
index 1fff6863b..e27f19478 100644
--- a/samples/vllm/README.md
+++ b/samples/vllm/README.md
@@ -1,6 +1,6 @@
 # Mistral & vLLM
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-vllm-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/vllm)
 
 This guide demonstrates how to deploy Mistral using vLLM. You'll need a Hugging Face token to begin.
 
diff --git a/samples/vuejs/README.md b/samples/vuejs/README.md
index 618436d2e..38c01eaab 100644
--- a/samples/vuejs/README.md
+++ b/samples/vuejs/README.md
@@ -1,6 +1,6 @@
 # Vue.js
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-vuejs-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/vuejs)
 
 This sample shows how to get a minimal Vue.js app up and running with Defang.
 
diff --git a/starter-sample/README.md b/starter-sample/README.md
index 23e4d03d6..5b1bc04e6 100644
--- a/starter-sample/README.md
+++ b/starter-sample/README.md
@@ -1,6 +1,6 @@
 # Starter Sample #REMOVE_ME_AFTER_EDITING
 
-[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-<YOUR_SAMPLE_DIR#REMOVE_ME_AFTER_EDITING>-template%26template_owner%3DDefangSamples)
+[![1-click-deploy](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Buttons/SVG/deploy-with-defang.svg)](https://portal.defang.io/sample/<YOUR_SAMPLE_DIR#REMOVE_ME_AFTER_EDITING>)
 
 This is a sample that shows the rough structure of an actual Defang sample. This top paragraph should give a bit of context about the project and what it does. The rest of the README should be a guide on how to use the sample. #REMOVE_ME_AFTER_EDITING