diff --git a/Dockerfile b/Dockerfile
index 76b045ff0669c859b9de59fa68fb844500f9eb0c..3f90fd6aff15e08d5a6d3ab5e4db57f39d1a873d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,18 +4,19 @@ ARG BASE_TAG=1.13.0
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
+COPY apache-activemq-bin.tar.gz /
 
-COPY apache-activemq-5.16.0-bin.tar.gz /
-
-# root user is needed to extract files from the ActiveMQ gzip
 USER root
 
-RUN dnf update -y && \
-    tar -zxf apache-activemq-5.16.0-bin.tar.gz && \
-    rm apache-activemq-5.16.0-bin.tar.gz && \
-    chmod 755 apache-activemq-5.16.0/bin/activemq && \
+RUN dnf upgrade -y && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf && \
+    mkdir -p apache-activemq && \
+    tar -zxf apache-activemq-bin.tar.gz --strip-components=1 -C apache-activemq && \
+    rm apache-activemq-bin.tar.gz && \
+    chmod 755 apache-activemq/bin/activemq && \
     useradd -r activemq --uid=1000 && \
-    chown -R activemq:activemq apache-activemq-5.16.0
+    chown -R activemq:activemq apache-activemq
 
 USER activemq
 
@@ -23,4 +24,4 @@ EXPOSE 8161 61616 5672 61613 1833
 
 HEALTHCHECK CMD curl localhost:8161
 
-CMD ["apache-activemq-5.16.0/bin/activemq", " start"]
\ No newline at end of file
+CMD ["apache-activemq/bin/activemq", " start"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 73eb4e4f51a1439d1851d3084fc0284db3fcec10..86dcbb725394cb3eb3d8abc27633c52345626012 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,11 @@
 
 # ActiveMQ
 
-Version: 5.15.13
-
 Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server.
 
 ## Download from Iron Bank
 
-1. Go to the [Apache webpage](https://ironbank.dsop.io/ironbank/repomap/opensource/apache) in Iron Bank and download the latest ActiveMQ tarball.
+1. Go to the [Apache webpage](https://ironbank.dso.mil/ironbank/repomap/opensource/apache) in Iron Bank and download the latest ActiveMQ tarball.
 
 2. Navigate to the location of the download and run:
 ```
@@ -53,5 +51,4 @@ You should now be able to navigate to the ActiveMQ dashboard URL and login using
 
 ## Notes
 
-- root user is needed to extract files from the ActiveMQ gzip
 - exposed ports: 8161, 61616, 5672, 61613, and 1833
\ No newline at end of file
diff --git a/deployment/activemq-deployment.yaml b/deployment/activemq-deployment.yaml
index 004b75c1f425e9c3ddf2d1d7e1b917683a8eddc0..2f188715332bb2b8cb94e4dcd90c843745180ece 100644
--- a/deployment/activemq-deployment.yaml
+++ b/deployment/activemq-deployment.yaml
@@ -27,7 +27,7 @@ spec:
               cpu: 400m
           volumeMounts:
           - name: active-creds
-            mountPath: /apache-activemq-5.15.13/conf/jetty-realm.properties # jetty-realm.properties MUST be configured with proper values first in order to deploy
+            mountPath: /apache-activemq/conf/jetty-realm.properties # jetty-realm.properties MUST be configured with proper values first in order to deploy
             subPath: jetty-realm.properties
       volumes:
       - name: active-creds
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index a46ab32203002f9212c4e74c3d2007cc1a30040e..08fb8e8fa1494b3eeac6d843f1b7677a8f99c529 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -20,24 +20,24 @@ args:
 labels:
   org.opencontainers.image.title: "activemq"
   ## Human-readable description of the software packaged in the image
-  # org.opencontainers.image.description: "FIXME"
+  org.opencontainers.image.description: "Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server."
   ## License(s) under which contained software is distributed
-  # org.opencontainers.image.licenses: "FIXME"
+  org.opencontainers.image.licenses: "Apache"
   ## URL to find more information on the image
-  # org.opencontainers.image.url: "FIXME"
+  org.opencontainers.image.url: "http://activemq.apache.org/components/classic/"
   ## Name of the distributing entity, organization or individual
-  # org.opencontainers.image.vendor: "FIXME"
+  org.opencontainers.image.vendor: "Apache"
   org.opencontainers.image.version: "5.16.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   # mil.dso.ironbank.image.keywords: "FIXME"
   ## This value can be "opensource" or "commercial"
-  # mil.dso.ironbank.image.type: "FIXME"
+  mil.dso.ironbank.image.type: "opensource"
   ## Product the image belongs to for grouping multiple images
-  # mil.dso.ironbank.product.name: "FIXME"
+  mil.dso.ironbank.product.name: "opensource/apache"
 
 # List of resources to make available to the offline build context
 resources:
-- filename: apache-activemq-5.16.0-bin.tar.gz
+- filename: apache-activemq-bin.tar.gz
   url: https://downloads.apache.org/activemq/5.16.0/apache-activemq-5.16.0-bin.tar.gz
   validation:
     type: sha512
@@ -48,11 +48,11 @@ resources:
 # FIXME: Include any other vendor information if applicable
 maintainers:
 - email: "bhearn@anchore.com"
-#   # The name of the current container owner
-#   name: "FIXME"
-#   # The gitlab username of the current container owner
-#   username: "FIXME"
-#   cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
+  # The name of the current container owner
+  name: "Blake Hearn"
+  # The gitlab username of the current container owner
+  username: "bhearn"
+  cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
 # - name: "FIXME"
 #   username: "FIXME"
 #   email: "FIXME"