diff --git a/Dockerfile b/Dockerfile
index 1b96c5819a1954a4770ca02e332e2875ab225e40..81485c774776429dc73a8da4edffbc3a01659716 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.9.3-ubi8
+ARG GITLAB_VERSION=v13.9.4-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.9.3
+ARG BASE_TAG=13.9.4
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -12,6 +12,15 @@ ARG MAILROOM_VERSION=0.0.8
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-mailroom" \
+      name="GitLab Mailroom" \
+      maintainer="GitLab Distribution Team" \
+      vendor="GitLab" \
+      version=${MAILROOM_VERSION} \
+      release=${MAILROOM_VERSION} \
+      summary="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received." \
+      description="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received."
+
 ADD gitlab-mailroom.tar.gz /
 
 COPY scripts/ /scripts/
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 73a051a4c8b5c7540ab304867ed9e856a4004c44..eac987c5ab1f446c265c05051e21d61e8a84bf45 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.9.3}
+TAG=${1:-13.9.4}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index cb705b077683cdd0b5fb267c12f38ba6075c2050..f98e06daa18771a2ef8fbf2bbc34897b798fd03d 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-mailroom"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.9.3"
+  - "13.9.4"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.9.3"
+  BASE_TAG: "13.9.4"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Mailroom"
@@ -22,7 +22,7 @@ labels:
   org.opencontainers.image.url: "https://about.gitlab.com/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Gitlab"
-  org.opencontainers.image.version: "13.9.3"
+  org.opencontainers.image.version: "13.9.4"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
   ## This value can be "opensource" or "commercial"
@@ -43,8 +43,8 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-mailroom.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.4-ubi8/gitlab-mailroom.tar.gz"
     filename: "gitlab-mailroom.tar.gz"
     validation:
       type: "sha256"
-      value: "3642cb6e6ad7b4465a45f00b58540da01f3885030e45b4c4686a7f34cfc5d3a3"
+      value: "7670303440597462797535d34a80ad76a87fd0ebce64e492b58402eedbeab98c"