diff --git a/.github/workflows/delivery-ubuntu.yml b/.github/workflows/delivery-ubuntu.yml
index e3ffdf1d5..af39a5fda 100644
--- a/.github/workflows/delivery-ubuntu.yml
+++ b/.github/workflows/delivery-ubuntu.yml
@@ -63,7 +63,7 @@ jobs:
               UBUNTU_VERSION:  ${{ matrix.target }}
 
             ###
-            # NOTE: 'uses' does not suport interpolation so we have to manually define the
+            # NOTE: 'uses' does not support interpolation so we have to manually define the
             # following steps per variant.
             ###
 
diff --git a/internal/commands/buildpack_inspect_test.go b/internal/commands/buildpack_inspect_test.go
index 0ade72b54..2e317aa83 100644
--- a/internal/commands/buildpack_inspect_test.go
+++ b/internal/commands/buildpack_inspect_test.go
@@ -481,7 +481,7 @@ func testBuildpackInspectCommand(t *testing.T, when spec.G, it spec.S) {
 				})
 			})
 
-			when("uri is a http or https location", func() {
+			when("uri is an http or https location", func() {
 				it.Before(func() {
 					simpleInfo.Location = buildpack.URILocator
 				})
diff --git a/internal/commands/inspect_buildpack_test.go b/internal/commands/inspect_buildpack_test.go
index e9c81213d..548575845 100644
--- a/internal/commands/inspect_buildpack_test.go
+++ b/internal/commands/inspect_buildpack_test.go
@@ -421,7 +421,7 @@ func testInspectBuildpackCommand(t *testing.T, when spec.G, it spec.S) {
 					assert.TrimmedEq(outBuf.String(), expectedOutput)
 				})
 			})
-			when("uri is a http or https location", func() {
+			when("uri is an http or https location", func() {
 				it.Before(func() {
 					simpleInfo.Location = buildpack.URILocator
 				})
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
index 881488660..9da39214f 100644
--- a/pkg/archive/archive.go
+++ b/pkg/archive/archive.go
@@ -59,7 +59,7 @@ func GenerateTar(genFn func(TarWriter) error) io.ReadCloser {
 	return GenerateTarWithWriter(genFn, DefaultTarWriterFactory())
 }
 
-// GenerateTarWithTar returns a reader to a tar from a generator function using a writer from the provided factory.
+// GenerateTarWithWriter returns a reader to a tar from a generator function using a writer from the provided factory.
 // Note that the generator will not fully execute until the reader is fully read from. Any errors returned by the
 // generator will be returned when reading the reader.
 func GenerateTarWithWriter(genFn func(TarWriter) error, twf TarWriterFactory) io.ReadCloser {
diff --git a/pkg/client/build.go b/pkg/client/build.go
index ca28762a6..e113c91cb 100644
--- a/pkg/client/build.go
+++ b/pkg/client/build.go
@@ -100,7 +100,7 @@ type BuildOptions struct {
 	DockerHost string
 
 	// Used to determine a run-image mirror if Run Image is empty.
-	// Used in combination with Builder metadata to determine to the the 'best' mirror.
+	// Used in combination with Builder metadata to determine to the 'best' mirror.
 	// 'best' is defined as:
 	//  - if Publish is true, the best mirror matches registry we are publishing to.
 	//  - if Publish is false, the best mirror matches a registry specified in Image.
diff --git a/pkg/client/build_test.go b/pkg/client/build_test.go
index 88c6e8b0a..856d13aaa 100644
--- a/pkg/client/build_test.go
+++ b/pkg/client/build_test.go
@@ -1202,7 +1202,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 					})
 				})
 
-				when("uri is a http url", func() {
+				when("uri is an http url", func() {
 					var server *ghttp.Server
 
 					it.Before(func() {