diff --git a/internal/distro/rhel7/azure.go b/internal/distro/rhel7/azure.go
index 628f4e46d..1b829f2a5 100644
--- a/internal/distro/rhel7/azure.go
+++ b/internal/distro/rhel7/azure.go
@@ -179,7 +179,7 @@ var azureRhuiBasePartitionTables = distro.BasePartitionTableMap{
 func vhdPipelines(compress bool) pipelinesFunc {
 	return func(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) {
 		pipelines := make([]osbuild.Pipeline, 0)
-		pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner))
+		pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner.String()))
 
 		partitionTable, err := t.getPartitionTable(customizations.GetFilesystems(), options, rng)
 		if err != nil {
diff --git a/internal/distro/rhel7/distro.go b/internal/distro/rhel7/distro.go
index 3b0b7f40a..0bf42255c 100644
--- a/internal/distro/rhel7/distro.go
+++ b/internal/distro/rhel7/distro.go
@@ -15,6 +15,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/osbuild/osbuild-composer/internal/osbuild"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
+	"github.com/osbuild/osbuild-composer/internal/runner"
 )
 
 const (
@@ -61,7 +62,7 @@ var distroMap = map[string]distribution{
 		releaseVersion:     "7",
 		modulePlatformID:   "platform:el7",
 		vendor:             "redhat",
-		runner:             "org.osbuild.rhel7",
+		runner:             &runner.RHEL{Major: uint64(7), Minor: uint64(9)},
 		defaultImageConfig: defaultDistroImageConfig,
 	},
 }
@@ -75,7 +76,7 @@ type distribution struct {
 	releaseVersion     string
 	modulePlatformID   string
 	vendor             string
-	runner             string
+	runner             runner.Runner
 	arches             map[string]distro.Arch
 	defaultImageConfig *distro.ImageConfig
 }
diff --git a/internal/distro/rhel7/qcow2.go b/internal/distro/rhel7/qcow2.go
index 37a6fb388..4ec016ae9 100644
--- a/internal/distro/rhel7/qcow2.go
+++ b/internal/distro/rhel7/qcow2.go
@@ -69,7 +69,7 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 
 func qcow2Pipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, rng *rand.Rand) ([]osbuild.Pipeline, error) {
 	pipelines := make([]osbuild.Pipeline, 0)
-	pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner))
+	pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner.String()))
 
 	partitionTable, err := t.getPartitionTable(customizations.GetFilesystems(), options, rng)
 	if err != nil {
diff --git a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
index e8d88ef8e..240433cf8 100644
--- a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
@@ -40,7 +40,7 @@
     "pipelines": [
       {
         "name": "build",
-        "runner": "org.osbuild.rhel7",
+        "runner": "org.osbuild.rhel79",
         "stages": [
           {
             "type": "org.osbuild.rpm",
diff --git a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
index 14a9cd300..52d216f8e 100644
--- a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
@@ -51,7 +51,7 @@
     "pipelines": [
       {
         "name": "build",
-        "runner": "org.osbuild.rhel7",
+        "runner": "org.osbuild.rhel79",
         "stages": [
           {
             "type": "org.osbuild.rpm",
diff --git a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
index 192953ee3..c2b9cf88e 100644
--- a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
@@ -121,7 +121,7 @@
     "pipelines": [
       {
         "name": "build",
-        "runner": "org.osbuild.rhel7",
+        "runner": "org.osbuild.rhel79",
         "stages": [
           {
             "type": "org.osbuild.rpm",