diff --git a/internal/pkg/image_repositories/build_workflow.go b/internal/pkg/image_repositories/build_workflow.go
index 5b7b460..9d0c020 100644
--- a/internal/pkg/image_repositories/build_workflow.go
+++ b/internal/pkg/image_repositories/build_workflow.go
@@ -5,6 +5,7 @@
 	"strings"
 )
 
+var EXTRAS map[string]string = map[string]string{}
 var PROFILES map[string]string = map[string]string{
 	"cinder":            "ceph qemu",
 	"glance":            "ceph",
@@ -27,7 +28,7 @@
 	"nova":          "ovmf qemu-efi-aarch64",
 }
 var PIP_PACKAGES map[string]string = map[string]string{
-	"glance":        "python-cinderclient os-brick",
+	"glance":        "glance_store[cinder]",
 	"horizon":       "designate-dashboard heat-dashboard ironic-ui magnum-ui neutron-vpnaas-dashboard octavia-dashboard senlin-dashboard monasca-ui",
 	"ironic":        "python-dracclient sushy",
 	"monasca-agent": "libvirt-python python-glanceclient python-neutronclient python-novaclient py3nvml",
@@ -40,6 +41,11 @@
 }
 
 func NewBuildWorkflow(project string) *GithubWorkflow {
+	extras := ""
+	if val, ok := EXTRAS[project]; ok {
+		extras = fmt.Sprintf("[%s]", val)
+	}
+
 	profiles := ""
 	if val, ok := PROFILES[project]; ok {
 		profiles = val
@@ -64,6 +70,7 @@
 		"RELEASE=${{ matrix.release }}",
 		fmt.Sprintf("PROJECT=%s", project),
 		"PROJECT_REF=${{ env.PROJECT_REF }}",
+		fmt.Sprintf("EXTRAS=%s", extras),
 		fmt.Sprintf("PROFILES=%s", profiles),
 		fmt.Sprintf("DIST_PACKAGES=%s", distPackages),
 		fmt.Sprintf("PIP_PACKAGES=%s", pipPackages),
diff --git a/internal/pkg/image_repositories/dockerfile.go b/internal/pkg/image_repositories/dockerfile.go
index f042c78..33bab71 100644
--- a/internal/pkg/image_repositories/dockerfile.go
+++ b/internal/pkg/image_repositories/dockerfile.go
@@ -33,6 +33,11 @@
 		return nil, err
 	}
 
+	builderImageTag, err := getImageTag(ctx, ir.githubClient, "docker-openstack-builder", "openstack-builder-focal")
+	if err != nil {
+		return nil, err
+	}
+
 	runtimeImageTag, err := getImageTag(ctx, ir.githubClient, "docker-openstack-runtime", "openstack-runtime-focal")
 	if err != nil {
 		return nil, err
@@ -42,7 +47,7 @@
 		BindepImage:     "quay.io/vexxhost/bindep-loci",
 		BindepImageTag:  "latest",
 		BuilderImage:    "quay.io/vexxhost/openstack-builder-focal",
-		BuilderImageTag: "latest",
+		BuilderImageTag: builderImageTag,
 		RuntimeImage:    "quay.io/vexxhost/openstack-runtime-focal",
 		RuntimeImageTag: runtimeImageTag,