diff --git a/.env.sample b/.env.sample
index ee04f7d..2ca5830 100644
--- a/.env.sample
+++ b/.env.sample
@@ -14,7 +14,9 @@ RE_ARCHIVE_LIMIT=
 SPACES_KEY=
 SPACES_SECRET=
 SPACES_ENDPOINT=
+SPACES_BUCKET_NAME=
 SPACES_REGION=
+SPACES_FORCE_PATH_STYLE=
 
 # SMTP Settings
 NEXT_PUBLIC_EMAIL_PROVIDER=
diff --git a/lib/api/storage/createFile.ts b/lib/api/storage/createFile.ts
index 8f55b45..31554fb 100644
--- a/lib/api/storage/createFile.ts
+++ b/lib/api/storage/createFile.ts
@@ -14,7 +14,7 @@ export default async function createFile({
 }) {
   if (s3Client) {
     const bucketParams: PutObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
       Body: isBase64 ? Buffer.from(data as string, "base64") : data,
     };
diff --git a/lib/api/storage/moveFile.ts b/lib/api/storage/moveFile.ts
index bbd8887..c86728f 100644
--- a/lib/api/storage/moveFile.ts
+++ b/lib/api/storage/moveFile.ts
@@ -5,7 +5,7 @@ import removeFile from "./removeFile";
 
 export default async function moveFile(from: string, to: string) {
   if (s3Client) {
-    const Bucket = process.env.BUCKET_NAME;
+    const Bucket = process.env.SPACES_BUCKET_NAME;
 
     const copyParams = {
       Bucket: Bucket,
diff --git a/lib/api/storage/readFile.ts b/lib/api/storage/readFile.ts
index 01e6fda..64ff8d7 100644
--- a/lib/api/storage/readFile.ts
+++ b/lib/api/storage/readFile.ts
@@ -20,7 +20,7 @@ export default async function readFile(filePath: string) {
 
   if (s3Client) {
     const bucketParams: GetObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
     };
 
diff --git a/lib/api/storage/removeFile.ts b/lib/api/storage/removeFile.ts
index 491e24c..e332829 100644
--- a/lib/api/storage/removeFile.ts
+++ b/lib/api/storage/removeFile.ts
@@ -6,7 +6,7 @@ import { PutObjectCommandInput, DeleteObjectCommand } from "@aws-sdk/client-s3";
 export default async function removeFile({ filePath }: { filePath: string }) {
   if (s3Client) {
     const bucketParams: PutObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
     };
 
diff --git a/lib/api/storage/removeFolder.ts b/lib/api/storage/removeFolder.ts
index 7383b88..e9f7d3b 100644
--- a/lib/api/storage/removeFolder.ts
+++ b/lib/api/storage/removeFolder.ts
@@ -40,7 +40,7 @@ async function emptyS3Directory(bucket: string, dir: string) {
 export default async function removeFolder({ filePath }: { filePath: string }) {
   if (s3Client) {
     try {
-      await emptyS3Directory(process.env.BUCKET_NAME as string, filePath);
+      await emptyS3Directory(process.env.SPACES_BUCKET_NAME as string, filePath);
     } catch (err) {
       console.log("Error", err);
     }
diff --git a/lib/api/storage/s3Client.ts b/lib/api/storage/s3Client.ts
index 8b0ccd5..cebba5a 100644
--- a/lib/api/storage/s3Client.ts
+++ b/lib/api/storage/s3Client.ts
@@ -6,7 +6,7 @@ const s3Client: S3 | undefined =
   process.env.SPACES_KEY &&
   process.env.SPACES_SECRET
     ? new S3({
-        forcePathStyle: false,
+        forcePathStyle: !!process.env.SPACES_FORCE_PATH_STYLE,
         endpoint: process.env.SPACES_ENDPOINT,
         region: process.env.SPACES_REGION,
         credentials: {
diff --git a/types/enviornment.d.ts b/types/enviornment.d.ts
index 24c1c44..d2bdbb8 100644
--- a/types/enviornment.d.ts
+++ b/types/enviornment.d.ts
@@ -13,8 +13,9 @@ declare global {
       SPACES_KEY?: string;
       SPACES_SECRET?: string;
       SPACES_ENDPOINT?: string;
-      BUCKET_NAME?: string;
+      SPACES_BUCKET_NAME?: string;
       SPACES_REGION?: string;
+      SPACES_FORCE_PATH_STYLE?: string;
 
       NEXT_PUBLIC_KEYCLOAK_ENABLED?: string;
       KEYCLOAK_ISSUER?: string;