diff --git a/internal/rosa/git.go b/internal/rosa/git.go
index d4d679ba..a1bd8e0d 100644
--- a/internal/rosa/git.go
+++ b/internal/rosa/git.go
@@ -17,22 +17,29 @@ func (t Toolchain) NewViaGit(
 	url, rev string,
 	checksum pkg.Checksum,
 ) pkg.Artifact {
-	return t.New(strings.TrimSuffix(
+	return t.NewPackage(strings.TrimSuffix(
 		path.Base(url),
 		".git",
-	)+"-src-"+path.Base(rev), THostNet, t.Append(nil,
-		_nssCACert,
-		_git,
-	), &checksum, nil, `
+	)+"-src", path.Base(rev), nil, &PackageAttr{
+		KnownChecksum: &checksum,
+
+		Flag:  THostNet,
+		Paths: []pkg.ExecPath{resolvconf()},
+	}, &GenericHelper{
+		Build: `
 git \
 	-c advice.detachedHead=false \
 	clone \
 	--depth=1 \
-	--revision=`+rev+` \
+	--revision=` + rev + ` \
 	--shallow-submodules \
 	--recurse-submodules \
-	`+url+` \
+	` + url + ` \
 	/work
 rm -rf /work/.git
-`, resolvconf())
+`,
+	},
+		_nssCACert,
+		_git,
+	)
 }
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go
index 456f82e7..77dc1592 100644
--- a/internal/rosa/rosa.go
+++ b/internal/rosa/rosa.go
@@ -363,9 +363,14 @@ function apply {
 			buf.WriteString("'\n")
 		}
 	}
-	return t.New(name+"-src", 0, t.Append(nil,
+
+	return t.NewPackage(name+"-src", Unversioned, nil, &PackageAttr{
+		Paths: paths,
+	}, &GenericHelper{
+		Build: buf.String(),
+	},
 		_patch,
-	), nil, nil, buf.String(), paths...)
+	)
 }
 
 // helperInPlace is a special directory value for omitting the cd statement.