diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
index 852859538706..d05e57033f3c 100644
--- a/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD
 ARG BASE_TAG=8.7
+=======
+ARG BASE_TAG=9.2
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
 
diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
index a9129926689b..ffcb8729d884 100644
--- a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
@@ -13,7 +13,11 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
+<<<<<<< HEAD
   BASE_TAG: "8.7"
+=======
+  BASE_TAG: "9.2"
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "auditbeat"
 
diff --git a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
index 9b34c1f459e1..3280897d6d43 100644
--- a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD
 ARG BASE_TAG=8.7
+=======
+ARG BASE_TAG=9.2
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
 
diff --git a/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
index e43033475f3e..89e2e1417091 100644
--- a/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
@@ -13,7 +13,11 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
+<<<<<<< HEAD
   BASE_TAG: "8.7"
+=======
+  BASE_TAG: "9.2"
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "filebeat"
 
diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
index 209756ca1d48..daa51e12156a 100644
--- a/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD
 ARG BASE_TAG=8.7
+=======
+ARG BASE_TAG=9.2
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files
 
diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
index 6033ad214dc5..8296d9114a8d 100644
--- a/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
@@ -13,7 +13,11 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
+<<<<<<< HEAD
   BASE_TAG: "8.7"
+=======
+  BASE_TAG: "9.2"
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "heartbeat"
 
diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
index ee78b132a756..752765a8fe42 100644
--- a/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD
 ARG BASE_TAG=8.7
+=======
+ARG BASE_TAG=9.2
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
 
diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
index 13e03d8d70ff..f1d1040b4843 100644
--- a/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
@@ -13,7 +13,11 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
+<<<<<<< HEAD
   BASE_TAG: "8.7"
+=======
+  BASE_TAG: "9.2"
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "metricbeat"
 
diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
index 9a53d7764596..6cc209e17dff 100644
--- a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
+++ b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
@@ -4,7 +4,11 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+<<<<<<< HEAD
 ARG BASE_TAG=8.7
+=======
+ARG BASE_TAG=9.2
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
 
diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
index c8335efb17bb..8d519b8f835b 100644
--- a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
@@ -13,7 +13,11 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
+<<<<<<< HEAD
   BASE_TAG: "8.7"
+=======
+  BASE_TAG: "9.2"
+>>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "packetbeat"