diff --git a/pkg/dockerfile/buildargs.go b/pkg/dockerfile/buildargs.go
index 358aa82f3..d948025e1 100644
--- a/pkg/dockerfile/buildargs.go
+++ b/pkg/dockerfile/buildargs.go
@@ -40,6 +40,13 @@ func NewBuildArgs(args []string) *BuildArgs {
 	}
 }
 
+func (b *BuildArgs) Clone() *BuildArgs {
+	clone := b.BuildArgs.Clone()
+	return &BuildArgs{
+		*clone,
+	}
+}
+
 // ReplacementEnvs returns a list of filtered environment variables
 func (b *BuildArgs) ReplacementEnvs(envs []string) []string {
 	filtered := b.FilterAllowed(envs)
diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go
index 3b5425340..e8a3908f0 100644
--- a/pkg/executor/executor.go
+++ b/pkg/executor/executor.go
@@ -157,7 +157,7 @@ func DoBuild(dockerfilePath, srcContext, snapshotMode string, args []string) (na
 			}
 			return ref, sourceImage, nil
 		}
-		if err := saveStageDependencies(index, stages, buildArgs); err != nil {
+		if err := saveStageDependencies(index, stages, buildArgs.Clone()); err != nil {
 			return nil, nil, err
 		}
 		// Delete the filesystem
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index 016bf9146..613a1043a 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -305,9 +305,6 @@ func RelativeFiles(fp string, root string) ([]string, error) {
 		if err != nil {
 			return err
 		}
-		if PathInWhitelist(path, root) {
-			return nil
-		}
 		relPath, err := filepath.Rel(root, path)
 		if err != nil {
 			return err