diff --git a/cmd/machine-config-operator/bootstrap.go b/cmd/machine-config-operator/bootstrap.go
index 5a37c1883a..75eeb74b9c 100644
--- a/cmd/machine-config-operator/bootstrap.go
+++ b/cmd/machine-config-operator/bootstrap.go
@@ -132,7 +132,7 @@ func runBootstrapCmd(_ *cobra.Command, _ []string) {
 		bootstrapOpts.oauthProxyImage = findImageOrDie(imgstream, "oauth-proxy")
 		bootstrapOpts.kubeRbacProxyImage = findImageOrDie(imgstream, "kube-rbac-proxy")
 		bootstrapOpts.infraImage = findImageOrDie(imgstream, "pod")
-		bootstrapOpts.haproxyImage = findImageOrDie(imgstream, "haproxy-router")
+		bootstrapOpts.haproxyImage = findImageOrDie(imgstream, "haproxy-router-haproxy32")
 		bootstrapOpts.dockerRegistryImage = findImageOrDie(imgstream, "docker-registry")
 		bootstrapOpts.baseOSContainerImage, err = findImage(imgstream, baseOSContainerImageTag)
 		if err != nil {
diff --git a/install/0000_80_machine-config_02_images.configmap.yaml b/install/0000_80_machine-config_02_images.configmap.yaml
index 0ee80876b2..dd5d2a15bb 100644
--- a/install/0000_80_machine-config_02_images.configmap.yaml
+++ b/install/0000_80_machine-config_02_images.configmap.yaml
@@ -15,7 +15,7 @@ data:
       "infraImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:pod",
       "keepalivedImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:keepalived-ipfailover",
       "corednsImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:coredns",
-      "haproxyImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router",
+      "haproxyImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router-haproxy32",
       "baremetalRuntimeCfgImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:baremetal-runtimecfg",
       "oauthProxy": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:oauth-proxy",
       "kubeRbacProxy": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:kube-rbac-proxy",
diff --git a/install/image-references b/install/image-references
index 44917fd2e9..970384176a 100644
--- a/install/image-references
+++ b/install/image-references
@@ -44,10 +44,10 @@ spec:
     from:
       kind: DockerImage
       name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:coredns
-  - name: haproxy-router
+  - name: haproxy-router-haproxy32
     from:
       kind: DockerImage
-      name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router
+      name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router-haproxy32
   - name: baremetal-runtimecfg
     from:
       kind: DockerImage
diff --git a/pkg/controller/template/constants.go b/pkg/controller/template/constants.go
index 91baec288e..6994658ce2 100644
--- a/pkg/controller/template/constants.go
+++ b/pkg/controller/template/constants.go
@@ -16,7 +16,7 @@ const (
 	// CorednsKey is the key that references the coredns image in the controller
 	CorednsKey string = "corednsImage"
 
-	// HaproxyKey is the key that references the haproxy-router image in the controller
+	// HaproxyKey is the key that references the haproxy-router-haproxy32 image in the controller
 	HaproxyKey string = "haproxyImage"
 
 	// BaremetalRuntimeCfgKey is the key that references the baremetal-runtimecfg image in the controller
diff --git a/templates/master/00-master/on-prem/files/haproxy.yaml b/templates/master/00-master/on-prem/files/haproxy.yaml
index d698264ac6..52e872e153 100644
--- a/templates/master/00-master/on-prem/files/haproxy.yaml
+++ b/templates/master/00-master/on-prem/files/haproxy.yaml
@@ -24,6 +24,8 @@ contents:
           path: "/var/lib/kubelet"
       - name: run-dir
         empty-dir: {}
+      - name: lib-run-dir
+        empty-dir: {}
       - name: conf-dir
         hostPath:
           path: "/etc/haproxy"
@@ -121,6 +123,8 @@ contents:
           mountPropagation: HostToContainer
         - name: run-dir
           mountPath: "/var/run/haproxy"
+        - name: lib-run-dir
+          mountPath: "/var/lib/haproxy/run"
         livenessProbe:
           initialDelaySeconds: 50
           httpGet: