diff --git a/Shaders/raytrace/raytrace_bake_bent.cso b/Shaders/raytrace/raytrace_bake_bent.cso
index ccc98820..10928ad1 100644
Binary files a/Shaders/raytrace/raytrace_bake_bent.cso and b/Shaders/raytrace/raytrace_bake_bent.cso differ
diff --git a/Shaders/raytrace/src/raytrace_bake_bent.hlsl b/Shaders/raytrace/src/raytrace_bake_bent.hlsl
index 906a6b4f..7d3d4814 100644
--- a/Shaders/raytrace/src/raytrace_bake_bent.hlsl
+++ b/Shaders/raytrace/src/raytrace_bake_bent.hlsl
@@ -10,7 +10,7 @@ struct Vertex {
 
 struct RayGenConstantBuffer {
 	float4 v0; // frame, strength, radius, offset
-	float4 v1;
+	float4 v1; // envstr, upaxis
 	float4 v2;
 	float4 v3;
 	float4 v4;
@@ -63,6 +63,8 @@ void raygeneration() {
 
 	accum = normalize(accum / SAMPLES) * 0.5 + 0.5;
 
+	if (constant_buffer.v1.y > 0) accum.xyz = float3(accum.x, accum.z, 1.0 - accum.y);
+
 	float3 color = float3(render_target[DispatchRaysIndex().xy].xyz);
 	if (constant_buffer.v0.x == 0) {
 		color = accum.xyz;
diff --git a/Sources/arm/node/MakeBake.hx b/Sources/arm/node/MakeBake.hx
index a3994bef..c3cc849c 100644
--- a/Sources/arm/node/MakeBake.hx
+++ b/Sources/arm/node/MakeBake.hx
@@ -68,10 +68,16 @@ class MakeBake {
 		else if (UITrait.inst.bakeType == 3) { // Normal (World)
 			frag.n = true;
 			frag.write('fragColor[0] = vec4(n * vec3(0.5, 0.5, 0.5) + vec3(0.5, 0.5, 0.5), 1.0);');
+			if (UITrait.inst.bakeUpAxis == 1) { // Y up
+				frag.write('fragColor[0].rgb = vec3(fragColor[0].r, fragColor[0].b, 1.0 - fragColor[0].g);');
+			}
 		}
 		else if (UITrait.inst.bakeType == 4) { // Position
 			frag.wposition = true;
 			frag.write('fragColor[0] = vec4(wposition * vec3(0.5, 0.5, 0.5) + vec3(0.5, 0.5, 0.5), 1.0);');
+			if (UITrait.inst.bakeUpAxis == 1) { // Y up
+				frag.write('fragColor[0].rgb = vec3(fragColor[0].r, fragColor[0].b, 1.0 - fragColor[0].g);');
+			}
 		}
 		else if (UITrait.inst.bakeType == 5) { // TexCoord
 			frag.write('fragColor[0] = vec4(texCoord.xy, 0.0, 1.0);');
diff --git a/Sources/arm/render/RenderPathRaytrace.hx b/Sources/arm/render/RenderPathRaytrace.hx
index a1ffd110..f1d2c975 100644
--- a/Sources/arm/render/RenderPathRaytrace.hx
+++ b/Sources/arm/render/RenderPathRaytrace.hx
@@ -191,6 +191,7 @@ class RenderPathRaytrace {
 			f32[2] = UITrait.inst.bakeAoRadius;
 			f32[3] = UITrait.inst.bakeAoOffset;
 			f32[4] = Scene.active.world.probe.raw.strength;
+			f32[5] = UITrait.inst.bakeUpAxis;
 
 			var baketex2 = path.renderTargets.get("baketex2").image;
 			Krom.raytraceDispatchRays(baketex2.renderTarget_, f32.buffer);
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index 07ae2755..5cf1eb1e 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -992,7 +992,7 @@ class UITrait {
 					bakes.push("BentNormal (DXR)");
 					#end
 					bakeType = ui.combo(bakeHandle, bakes, "Bake");
-					if (bakeType == 3 || bakeType == 4 || bakeType == 8) {
+					if (bakeType == 3 || bakeType == 4 || bakeType == 9) {
 						var bakeUpAxisHandle = Id.handle({position: bakeUpAxis});
 						bakeUpAxis = ui.combo(bakeUpAxisHandle, ["Z", "Y"], "Up Axis");
 					}
@@ -1031,8 +1031,6 @@ class UITrait {
 					}
 					if (ui.changed) {
 						MaterialParser.parsePaintMaterial();
-						// Context.pdirty = 4;
-						// pushUndo
 					}
 				}
 				else {