diff --git a/Dockerfile b/Dockerfile
index debecea..1277794 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,8 +52,8 @@ ENV PATH=$NVM_DIR/versions/node/$NODE_VERSION/bin:$PATH
 
 # Change this value ONLY if we have done breaking changes for every material, doing so is VERY costly
 ENV AB_VERSION=v13
-ENV AB_VERSION_WINDOWS=v24
-ENV AB_VERSION_MAC=v24
+ENV AB_VERSION_WINDOWS=v25
+ENV AB_VERSION_MAC=v25
 
 # NODE_ENV is used to configure some runtime options, like JSON logger
 ENV NODE_ENV=production
diff --git a/consumer-server/src/logic/conversion-task.ts b/consumer-server/src/logic/conversion-task.ts
index fe38556..20b6d15 100644
--- a/consumer-server/src/logic/conversion-task.ts
+++ b/consumer-server/src/logic/conversion-task.ts
@@ -267,8 +267,15 @@ export async function executeConversion(
       logger.error('Empty conversion', { ...defaultLoggerMetadata, manifest } as any)
     }
 
+    let uploadPath: string = ''
+    if ($BUILD_TARGET === 'webgl') {
+      uploadPath = $AB_VERSION
+    } else {
+      uploadPath = $AB_VERSION + '/' + entityId
+    }
+
     // first upload the content
-    await uploadDir(components.cdnS3, cdnBucket, outDirectory, $AB_VERSION, {
+    await uploadDir(components.cdnS3, cdnBucket, outDirectory, uploadPath, {
       concurrency: 10,
       matches: [
         {