diff --git a/README.md b/README.md
index eab305208..cc4ae65a1 100644
--- a/README.md
+++ b/README.md
@@ -4722,9 +4722,11 @@ Sets up a global cubemap, which affects the default `scene.environment`, and opt
 ```jsx
 <Environment
   background={false} // can be true, false or "only" (which only sets the background) (default: false)
-  blur={0} // optional blur factor between 0 and 1 (default: 0, only works with three 0.146 and up)
-  intensity={1} // optional intensity factor (default: 1, only works with three 0.163 and up)
-  rotation={[0, Math.PI / 2, 0]} // optional rotation (default: 0, only works with three 0.163 and up)
+  backgroundBlurriness={0} // optional blur factor between 0 and 1 (default: 0, only works with three 0.146 and up)
+  backgroundIntensity={1} // optional intensity factor (default: 1, only works with three 0.163 and up)
+  backgroundRotation={[0, Math.PI / 2, 0]} // optional rotation (default: 0, only works with three 0.163 and up)
+  environmentIntensity={1} // optional intensity factor (default: 1, only works with three 0.163 and up)
+  environmentRotation={[0, Math.PI / 2, 0]} // optional rotation (default: 0, only works with three 0.163 and up)
   files={['px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png']}
   path="/"
   preset={null}
diff --git a/src/core/Environment.tsx b/src/core/Environment.tsx
index f30935c92..55ee13dc5 100644
--- a/src/core/Environment.tsx
+++ b/src/core/Environment.tsx
@@ -12,9 +12,15 @@ export type EnvironmentProps = {
   far?: number
   resolution?: number
   background?: boolean | 'only'
+
+  /** deprecated, use backgroundBlurriness */
   blur?: number
-  intensity?: number
-  rotation?: Vector3
+  backgroundBlurriness?: number
+  backgroundIntensity?: number
+  backgroundRotation?: Vector3
+  environmentIntensity?: number
+  environmentRotation?: Vector3
+
   map?: Texture
   preset?: PresetsType
   scene?: Scene | React.MutableRefObject<Scene>
@@ -35,57 +41,78 @@ function setEnvProps(
   scene: Scene | React.MutableRefObject<Scene> | undefined,
   defaultScene: Scene,
   texture: Texture,
-  blur: number = 0,
-  intensity: number = 1,
-  rotation: Vector3 = [0, 0, 0]
+  sceneProps: Partial<EnvironmentProps> = {}
 ) {
+  // defaults
+  sceneProps = {
+    backgroundBlurriness: sceneProps.blur ?? 0,
+    backgroundIntensity: 1,
+    backgroundRotation: [0, 0, 0],
+    environmentIntensity: 1,
+    environmentRotation: [0, 0, 0],
+    ...sceneProps,
+  }
+
   const target = resolveScene(scene || defaultScene)
   const oldbg = target.background
   const oldenv = target.environment
-  // @ts-ignore
-  const oldBlur = target.backgroundBlurriness || 0
-  // @ts-ignore
-  const oldIntensity = target.environmentIntensity || 1
-  // @ts-ignore
-  const oldRotation = target.backgroundBlurriness !== undefined ? target.backgroundRotation.copy() : 0
-  if (background !== 'only') target.environment = texture
-  if (background) {
-    target.background = texture
+  const oldSceneProps = {
+    // @ts-ignore
+    backgroundBlurriness: target.backgroundBlurriness,
     // @ts-ignore
-    if (target.backgroundBlurriness !== undefined) target.backgroundBlurriness = blur
+    backgroundIntensity: target.backgroundIntensity,
     // @ts-ignore
-    if (target.environmentIntensity !== undefined) target.environmentIntensity = intensity
+    backgroundRotation: target.backgroundRotation?.clone?.() ?? [0, 0, 0],
     // @ts-ignore
-    if (target.backgroundRotation !== undefined) applyProps(target, { backgroundRotation: rotation })
+    environmentIntensity: target.environmentIntensity,
+    // @ts-ignore
+    environmentRotation: target.environmentRotation?.clone?.() ?? [0, 0, 0],
+  }
+  if (background !== 'only') target.environment = texture
+  if (background) {
+    target.background = texture
+    applyProps(target as any, sceneProps)
   }
   return () => {
     if (background !== 'only') target.environment = oldenv
     if (background) {
       target.background = oldbg
-      // @ts-ignore
-      if (target.backgroundBlurriness !== undefined) target.backgroundBlurriness = oldBlur
-      // @ts-ignore
-      if (target.environmentIntensity !== undefined) target.environmentIntensity = oldIntensity
-      // @ts-ignore
-      if (target.backgroundRotation !== undefined) applyProps(target, { backgroundRotation: oldRotation })
+      applyProps(target as any, oldSceneProps)
     }
   }
 }
 
-export function EnvironmentMap({ scene, background = false, blur, rotation, intensity, map }: EnvironmentProps) {
+export function EnvironmentMap({ scene, background = false, map, ...config }: EnvironmentProps) {
   const defaultScene = useThree((state) => state.scene)
   React.useLayoutEffect(() => {
-    if (map) return setEnvProps(background, scene, defaultScene, map, blur, intensity, rotation)
-  }, [defaultScene, scene, map, background, blur, rotation])
+    if (map) return setEnvProps(background, scene, defaultScene, map, config)
+  })
   return null
 }
 
-export function EnvironmentCube({ background = false, scene, blur, rotation, intensity, ...rest }: EnvironmentProps) {
+export function EnvironmentCube({
+  background = false,
+  scene,
+  blur,
+  backgroundBlurriness,
+  backgroundIntensity,
+  backgroundRotation,
+  environmentIntensity,
+  environmentRotation,
+  ...rest
+}: EnvironmentProps) {
   const texture = useEnvironment(rest)
   const defaultScene = useThree((state) => state.scene)
   React.useLayoutEffect(() => {
-    return setEnvProps(background, scene, defaultScene, texture, blur, intensity, rotation)
-  }, [texture, background, scene, defaultScene, blur, rotation])
+    return setEnvProps(background, scene, defaultScene, texture, {
+      blur,
+      backgroundBlurriness,
+      backgroundIntensity,
+      backgroundRotation,
+      environmentIntensity,
+      environmentRotation,
+    })
+  })
   return null
 }
 
@@ -98,8 +125,11 @@ export function EnvironmentPortal({
   map,
   background = false,
   blur,
-  intensity,
-  rotation,
+  backgroundBlurriness,
+  backgroundIntensity,
+  backgroundRotation,
+  environmentIntensity,
+  environmentRotation,
   scene,
   files,
   path,
@@ -118,7 +148,14 @@ export function EnvironmentPortal({
 
   React.useLayoutEffect(() => {
     if (frames === 1) camera.current.update(gl, virtualScene)
-    return setEnvProps(background, scene, defaultScene, fbo.texture, blur, intensity, rotation)
+    return setEnvProps(background, scene, defaultScene, fbo.texture, {
+      blur,
+      backgroundBlurriness,
+      backgroundIntensity,
+      backgroundRotation,
+      environmentIntensity,
+      environmentRotation,
+    })
   }, [children, virtualScene, fbo.texture, scene, defaultScene, background, frames, gl])
 
   let count = 1
diff --git a/test/e2e/App.jsx b/test/e2e/App.jsx
index 5a5d842cc..329336483 100644
--- a/test/e2e/App.jsx
+++ b/test/e2e/App.jsx
@@ -2,7 +2,7 @@
 
 import { Suspense, useEffect } from 'react'
 import { Canvas } from '@react-three/fiber'
-import { Box, Environment, CameraControls } from '@react-three/drei' // eslint-disable-line import/no-unresolved
+import { Sphere, Environment, CameraControls } from '@react-three/drei' // eslint-disable-line import/no-unresolved
 
 function App() {
   return (
@@ -21,12 +21,10 @@ function Scene() {
 
   return (
     <>
-      <Box>
-        <meshStandardMaterial />
-      </Box>
-
+      <Sphere>
+        <meshStandardMaterial roughness={0} metalness={1} />
+      </Sphere>
       <Environment preset="city" />
-
       <CameraControls />
     </>
   )
diff --git a/test/e2e/__image_snapshots__/snapshot-test-js-snapshot-should-match-previous-one-1-snap.png b/test/e2e/__image_snapshots__/snapshot-test-js-snapshot-should-match-previous-one-1-snap.png
index 54617209a..6243f912f 100644
Binary files a/test/e2e/__image_snapshots__/snapshot-test-js-snapshot-should-match-previous-one-1-snap.png and b/test/e2e/__image_snapshots__/snapshot-test-js-snapshot-should-match-previous-one-1-snap.png differ