diff --git a/docker/prometheus/prometheus-jiralert/Dockerfile.j2 b/docker/prometheus/prometheus-jiralert/Dockerfile.j2
new file mode 100644
index 0000000000..13943d1587
--- /dev/null
+++ b/docker/prometheus/prometheus-jiralert/Dockerfile.j2
@@ -0,0 +1,47 @@
+FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% block prometheus_jiralert_header %}{% endblock %}
+
+{% if base_package_type == 'rpm' %}
+    {% set prometheus_jiralert_packages = [
+        'git',
+        'go',
+        'make',
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set prometheus_jiralert_packages = [
+        'golang-go',
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(prometheus_jiralert_packages | customizable("packages")) }}
+
+{% block prometheus_jiralert_version %}
+ARG prometheus_jiralert_version=master
+ARG prometheus_jiralert_url=https://github.com/stackhpc/jiralert/archive/refs/heads/${prometheus_jiralert_version}.tar.gz
+{% endblock %}
+
+{% block prometheus_jiralert_install %}
+ENV GOPATH=/build
+RUN mkdir /build \
+    && cd /build \
+    && curl -o jiralert.tar.gz ${prometheus_jiralert_url} \
+    && tar xvf jiralert.tar.gz \
+    && cd jiralert-${prometheus_jiralert_version} \
+    && make build \
+    && mkdir /opt/jiralert \
+    && install -m 0755 jiralert /opt/jiralert/ \
+    && install -m 0644 LICENSE /opt/jiralert/ \
+    && install -m 0644 README.md /opt/jiralert/ \
+    && rm -rf /build
+{% endblock %}
+
+{% block prometheus_jiralert_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER prometheus
diff --git a/docker/prometheus/prometheus-msteams/Dockerfile.j2 b/docker/prometheus/prometheus-msteams/Dockerfile.j2
new file mode 100644
index 0000000000..a43b8b1eef
--- /dev/null
+++ b/docker/prometheus/prometheus-msteams/Dockerfile.j2
@@ -0,0 +1,21 @@
+FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block prometheus_msteams_header %}{% endblock %}
+
+{% block prometheus_msteams_repository_version %}
+ENV prometheus_msteams_version=1.5.0
+{% endblock %}
+
+{% block prometheus_msteams_install %}
+RUN curl -o /opt/prometheus-msteams https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}} \
+    && chmod 0755 /opt/prometheus-msteams \
+    && mkdir -p /etc/msteams
+{% endblock %}
+
+{% block prometheus_msteams_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER prometheus
diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
index 0150e1d6c7..8ed6b25bbf 100644
--- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
@@ -3,17 +3,40 @@ FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% block prometheus_openstack_exporter_header %}{% endblock %}
 
-{% block prometheus_openstack_exporter_repository_version %}
-ENV prometheus_openstack_exporter_version=1.3.0
-{% endblock %}
+{% if base_package_type == 'rpm' %}
+    {% set prometheus_openstack_exporter_packages = [
+        'git',
+        'go',
+        'make',
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set prometheus_openstack_exporter_packages = [
+        'build-essential',
+        'git',
+        'golang-go',
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(prometheus_openstack_exporter_packages | customizable("packages")) }}
 
 {% block prometheus_openstack_exporter_install %}
-RUN curl -o /tmp/prometheus_openstack_exporter.tar.gz https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter-${prometheus_openstack_exporter_version}.linux-{{debian_arch}}.tar.gz \
-    && tar xvf /tmp/prometheus_openstack_exporter.tar.gz -C /opt/ \
-    && rm -f /tmp/prometheus_openstack_exporter.tar.gz \
-    && ln -s /opt/openstack-exporter* /opt/openstack-exporter
+ARG prometheus_openstack_exporter_url=https://github.com/stackhpc/openstack-exporter/archive/refs/heads
+ARG prometheus_openstack_exporter_version=project-parent-id
+ENV GOPATH=/build
+RUN mkdir /build \
+    && cd /build \
+    && curl -o openstack-exporter.tar.gz ${prometheus_openstack_exporter_url}/${prometheus_openstack_exporter_version}.tar.gz  \
+    && tar xvf openstack-exporter.tar.gz \
+    && cd openstack-exporter-${prometheus_openstack_exporter_version} \
+    && make common-build \
+    && mv openstack-exporter-${prometheus_openstack_exporter_version} openstack-exporter \
+    && mkdir /opt/openstack-exporter \
+    && install -m 0755 openstack-exporter /opt/openstack-exporter/ \
+    && rm -rf /build
 {% endblock %}
 
 {% block prometheus_openstack_exporter_footer %}{% endblock %}