diff --git a/infra/cdn.ts b/infra/cdn.ts
index 81f657de..8d510d8c 100644
--- a/infra/cdn.ts
+++ b/infra/cdn.ts
@@ -3,11 +3,11 @@ import { storage } from "./storage";
 
 export const cdn = new sst.aws.Router("CDNRouter", {
     routes: {
-        "/public": {
+        "/*": {
             bucket: storage,
             rewrite: {
-                regex: "^/public/([a-zA-Z0-9_-]+)$",
-                to: "/images/$1"
+                regex: "^/([a-zA-Z0-9_-]+)$",
+                to: "/public/$1"
             },
         },
     },
diff --git a/packages/functions/src/events/index.ts b/packages/functions/src/events/index.ts
index 51c8f354..9a90c253 100644
--- a/packages/functions/src/events/index.ts
+++ b/packages/functions/src/events/index.ts
@@ -48,7 +48,7 @@ export const handler = bus.subscriber(
           await s3.send(
             new HeadObjectCommand({
               Bucket: Resource.Storage.name,
-              Key: `images/${image.hash}`,
+              Key: `public/${image.hash}`,
             })
           );
 
@@ -57,7 +57,7 @@ export const handler = bus.subscriber(
           await s3.send(
             new PutObjectCommand({
               Bucket: Resource.Storage.name,
-              Key: `images/${image.hash}`,
+              Key: `public/${image.hash}`,
               Body: image.buffer,
               ...(image.format && { ContentType: `image/${image.format}` }),
               Metadata: {
@@ -91,7 +91,7 @@ export const handler = bus.subscriber(
           await s3.send(
             new HeadObjectCommand({
               Bucket: Resource.Storage.name,
-              Key: `images/${image.hash}`,
+              Key: `public/${image.hash}`,
             })
           );
 
@@ -100,7 +100,7 @@ export const handler = bus.subscriber(
           await s3.send(
             new PutObjectCommand({
               Bucket: Resource.Storage.name,
-              Key: `images/${image.hash}`,
+              Key: `public/${image.hash}`,
               Body: image.buffer,
               ...(image.format && { ContentType: `image/${image.format}` }),
               Metadata: {
@@ -136,7 +136,7 @@ export const handler = bus.subscriber(
               await s3.send(
                 new HeadObjectCommand({
                   Bucket: Resource.Storage.name,
-                  Key: `images/${image.hash}`,
+                  Key: `public/${image.hash}`,
                 })
               );
 
@@ -145,7 +145,7 @@ export const handler = bus.subscriber(
               await s3.send(
                 new PutObjectCommand({
                   Bucket: Resource.Storage.name,
-                  Key: `images/${image.hash}`,
+                  Key: `public/${image.hash}`,
                   Body: image.buffer,
                   ...(image.format && { ContentType: `image/${image.format}` }),
                   Metadata: {