diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2d34fe26a..968da8541f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,11 @@
   Docker/OCI container.
 - Instances are no longer created with an IPC namespace by default. An IPC
   namespace can be specified with the `-i|--ipc` flag.
+- `--bind`, `--nv` and `--rocm` options for `build` command can't be set through
+  environment variables `SINGULARITY_BIND`, `SINGULARITY_BINDPATH`, `SINGULARITY_NV`,
+  `SINGULARITY_ROCM` anymore due to side effects reported by users in this
+  [issue](https://github.com/hpcng/singularity/pull/6211), they must be explicitely
+  requested via command line.
 - `--nohttps` flag has been deprecated in favour of `--no-https`. The old flag
   is still accepted, but will display a deprecation warning.
 - Removed `--nonet` flag, which was intended to disable networking for in-VM
diff --git a/cmd/internal/cli/build.go b/cmd/internal/cli/build.go
index 965c247553..73643211b8 100644
--- a/cmd/internal/cli/build.go
+++ b/cmd/internal/cli/build.go
@@ -215,7 +215,6 @@ var buildNvFlag = cmdline.Flag{
 	DefaultValue: false,
 	Name:         "nv",
 	Usage:        "inject host Nvidia libraries during build for post and test sections (not supported with remote build)",
-	EnvKeys:      []string{"NV"},
 }
 
 // --rocm
@@ -225,7 +224,6 @@ var buildRocmFlag = cmdline.Flag{
 	DefaultValue: false,
 	Name:         "rocm",
 	Usage:        "inject host Rocm libraries during build for post and test sections (not supported with remote build)",
-	EnvKeys:      []string{"ROCM"},
 }
 
 // -B|--bind
@@ -240,8 +238,6 @@ var buildBindFlag = cmdline.Flag{
 		"it is set equal to src. Mount options ('opts') may be specified as 'ro'" +
 		"(read-only) or 'rw' (read/write, which is the default)." +
 		"Multiple bind paths can be given by a comma separated list. (not supported with remote build)",
-	EnvKeys:    []string{"BIND", "BINDPATH"},
-	EnvHandler: cmdline.EnvAppendValue,
 }
 
 // --writable-tmpfs