diff --git a/cmd/main.go b/cmd/main.go
index ec8022b3f9..4a3b2629cf 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -77,12 +77,17 @@ func main() {
 	flags.BoolVar(&useNewgidmap, "use-newgidmap", os.Geteuid() != 0, "use newgidmap to set up GID mappings")
 	wrapped := command.Run
 	command.Run = func(c *cobra.Command, args []string) {
-		storeOptions, err := storage.DefaultStoreOptions(false, 0)
-		kcmdutil.CheckErr(err)
-		os.MkdirAll(storeOptions.GraphRoot, 0775)
-		os.MkdirAll(storeOptions.RunRoot, 0775)
-		maybeReexecUsingUserNamespace(uidmap, useNewuidmap, gidmap, useNewgidmap)
-		wrapped(c, args)
+		switch basename {
+		case "openshift-sti-build", "openshift-docker-build", "openshift-extract-image-content":
+			storeOptions, err := storage.DefaultStoreOptions(false, 0)
+			kcmdutil.CheckErr(err)
+			os.MkdirAll(storeOptions.GraphRoot, 0775)
+			os.MkdirAll(storeOptions.RunRoot, 0775)
+			maybeReexecUsingUserNamespace(uidmap, useNewuidmap, gidmap, useNewgidmap)
+			wrapped(c, args)
+		default:
+			wrapped(c, args)
+		}
 	}
 
 	if err := command.Execute(); err != nil {
@@ -100,9 +105,9 @@ func CommandFor(basename string) *cobra.Command {
 		cmd = NewCommandS2IBuilder(basename)
 	case "openshift-docker-build", "openshift-docker-build-in-a-user-namespace":
 		cmd = NewCommandDockerBuilder(basename)
-	case "openshift-git-clone", "openshift-git-clone-in-a-user-namespace":
+	case "openshift-git-clone":
 		cmd = NewCommandGitClone(basename)
-	case "openshift-manage-dockerfile", "openshift-manage-dockerfile-in-a-user-namespace":
+	case "openshift-manage-dockerfile":
 		cmd = NewCommandManageDockerfile(basename)
 	case "openshift-extract-image-content", "openshift-extract-image-content-in-a-user-namespace":
 		cmd = NewCommandExtractImageContent(basename)
diff --git a/pkg/build/builder/transient_mounts.go b/pkg/build/builder/transient_mounts.go
index 1155211bbd..3803ea74f3 100644
--- a/pkg/build/builder/transient_mounts.go
+++ b/pkg/build/builder/transient_mounts.go
@@ -2,6 +2,7 @@ package builder
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 )
 
@@ -75,6 +76,7 @@ func (t TransientMounts) asSlice() []string {
 	for _, m := range t {
 		mounts = append(mounts, m.String())
 	}
+	sort.Strings(mounts)
 	return mounts
 }