diff --git a/build.go b/build.go
index 5895c8ab..38f4d98d 100644
--- a/build.go
+++ b/build.go
@@ -166,9 +166,7 @@ func Build(
 		}
 		pipLayer.SharedEnv.Prepend("PYTHONPATH", strings.TrimRight(sitePackagesPath, "\n"), ":")
 
-		logger.Process("Configuring environment")
-		logger.Subprocess("%s", scribe.NewFormattedMapFromEnvironment(pipLayer.SharedEnv))
-		logger.Break()
+		logger.EnvironmentVariables(pipLayer)
 
 		pipLayer.Metadata = map[string]interface{}{
 			DependencySHAKey: dependency.SHA256,
diff --git a/build_test.go b/build_test.go
index 3b68b822..81abdd0e 100644
--- a/build_test.go
+++ b/build_test.go
@@ -192,7 +192,6 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		Expect(buffer.String()).To(ContainSubstring("Some Buildpack some-version"))
 		Expect(buffer.String()).To(ContainSubstring("Executing build process"))
 		Expect(buffer.String()).To(ContainSubstring("Installing Pip"))
-		Expect(buffer.String()).To(ContainSubstring("Configuring environment"))
 	})
 
 	context("when build plan entries require pip at build/launch", func() {
diff --git a/integration/default_test.go b/integration/default_test.go
index af126eff..5562b550 100644
--- a/integration/default_test.go
+++ b/integration/default_test.go
@@ -75,7 +75,10 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				MatchRegexp(`      Completed in \d+\.\d+`),
 			))
 			Expect(logs).To(ContainLines(
-				"  Configuring environment",
+				"  Configuring build environment",
+				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "\/layers\/%s\/pip\/lib\/python\d+\.\d+\/site-packages:\$PYTHONPATH"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
+				"",
+				"  Configuring launch environment",
 				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "\/layers\/%s\/pip\/lib\/python\d+\.\d+\/site-packages:\$PYTHONPATH"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
 			))
 
diff --git a/integration/layer_reuse_test.go b/integration/layer_reuse_test.go
index 881466f1..37d4bf95 100644
--- a/integration/layer_reuse_test.go
+++ b/integration/layer_reuse_test.go
@@ -190,7 +190,10 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
 				MatchRegexp(`      Completed in \d+\.\d+`),
 			))
 			Expect(logs).To(ContainLines(
-				"  Configuring environment",
+				"  Configuring build environment",
+				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "\/layers\/%s\/pip\/lib\/python\d+\.\d+\/site-packages:\$PYTHONPATH"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
+				"",
+				"  Configuring launch environment",
 				MatchRegexp(fmt.Sprintf(`    PYTHONPATH -> "\/layers\/%s\/pip\/lib\/python\d+\.\d+\/site-packages:\$PYTHONPATH"`, strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
 			))