diff --git a/client/Dockerfile b/client/Dockerfile
index 1c0b216..e63ecd4 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -6,6 +6,9 @@ RUN npm ci
 ARG NEXT_PUBLIC_API_URL
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 
+ARG NEXT_PUBLIC_APP_URL
+ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL
+
 COPY . .
 RUN npm run build
 
diff --git a/client/next.config.ts b/client/next.config.ts
index fa13642..5af7210 100644
--- a/client/next.config.ts
+++ b/client/next.config.ts
@@ -1,8 +1,15 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
-
   output: 'standalone',
+  async rewrites() {
+    return [
+      {
+        source: '/l/:slug',
+        destination: `${process.env.INTERNAL_BACKEND_URL || 'http://localhost:4001'}/l/:slug`
+      }
+    ];
+  }
 };
 
 export default nextConfig;
diff --git a/client/src/app/dashboard/create/page.tsx b/client/src/app/dashboard/create/page.tsx
index 602dcbd..47f3686 100644
--- a/client/src/app/dashboard/create/page.tsx
+++ b/client/src/app/dashboard/create/page.tsx
@@ -123,9 +123,9 @@ export default function CreateQRPage() {
 
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">Custom Short Link (Optional)</label>
-                <div className="flex shadow-sm rounded-lg overflow-hidden border border-gray-300 focus-within:ring-2 focus-within:ring-indigo-500">
-                    <span className="inline-flex items-center px-4 bg-gray-50 text-gray-500 border-r border-gray-300 text-sm">
-                        /l/
+                <div className="flex flex-col sm:flex-row shadow-sm rounded-lg overflow-hidden border border-gray-300 focus-within:ring-2 focus-within:ring-indigo-500">
+                    <span className="inline-flex items-center px-4 bg-gray-50 text-gray-500 border-r border-gray-300 text-sm whitespace-nowrap">
+                        {(process.env.NEXT_PUBLIC_APP_URL || 'https://qr.houseofwebsites.ai').replace(/^https?:\/\//, '')}/l/
                     </span>
                     <input 
                       type="text" 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 35498e1..9ded196 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,6 +9,8 @@ services:
       - "4000"
     environment:
       - PORT=4000
+      - INTERNAL_BACKEND_URL=http://backend:4001
+      - NEXT_PUBLIC_APP_URL=${FRONTEND_URL:-https://qr.houseofwebsites.ai}
     depends_on:
       - backend
 
@@ -27,6 +29,7 @@ services:
       - PGDATABASE=ckqr
       - REDIS_HOST=redis
       - REDIS_PORT=6379
+      - BASE_URL=${FRONTEND_URL:-https://qr.houseofwebsites.ai}
     depends_on:
       - postgres
       - redis