diff --git a/bitnami/chartmuseum/0/ol-7/Dockerfile b/bitnami/chartmuseum/0/ol-7/Dockerfile
new file mode 100644
index 000000000000..884ce12aa9f1
--- /dev/null
+++ b/bitnami/chartmuseum/0/ol-7/Dockerfile
@@ -0,0 +1,21 @@
+FROM bitnami/oraclelinux-extras-base:7-r371
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
+    HOME="/" \
+    OS_ARCH="x86_64" \
+    OS_FLAVOUR="ol-7" \
+    OS_NAME="linux"
+
+# Install required system packages and dependencies
+RUN . ./libcomponent.sh && component_unpack "chartmuseum" "0.9.0-1" --checksum a962d91c0568bdc383a3d6fcae6278de7e3c1303666c02fcc6a89a9ff35d235c
+
+COPY rootfs /
+ENV BITNAMI_APP_NAME="chartmuseum" \
+    BITNAMI_IMAGE_VERSION="0.9.0-ol-7-r0" \
+    NAMI_PREFIX="/.nami" \
+    PATH="/opt/bitnami/chartmuseum/bin:$PATH"
+
+USER 1001
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/run.sh" ]
diff --git a/bitnami/chartmuseum/0/ol-7/docker-compose.yml b/bitnami/chartmuseum/0/ol-7/docker-compose.yml
new file mode 100644
index 000000000000..66a8a4915e94
--- /dev/null
+++ b/bitnami/chartmuseum/0/ol-7/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '2'
+services:
+  chartmuseum:
+    image: bitnami/chartmuseum:0-ol-7
+    ports:
+      - '8080:8080'
+    volumes:
+      - chartmuseum_data:/bitnami/data
+volumes:
+  chartmuseum_data:
+    driver: local
diff --git a/bitnami/chartmuseum/0/ol-7/rootfs/entrypoint.sh b/bitnami/chartmuseum/0/ol-7/rootfs/entrypoint.sh
new file mode 100755
index 000000000000..64b9d06f8c5d
--- /dev/null
+++ b/bitnami/chartmuseum/0/ol-7/rootfs/entrypoint.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+#set -o xtrace
+# shellcheck disable=SC1091
+
+# Load libraries
+. /libbitnami.sh
+
+print_welcome_page
+
+if [[ "$*" = *"/run.sh"* ]]; then
+    info "** Starting chartmuseum setup **"
+    /setup.sh
+    info "** chartmuseum setup finished! **"
+fi
+
+echo ""
+exec "$@"
diff --git a/bitnami/chartmuseum/0/ol-7/rootfs/run.sh b/bitnami/chartmuseum/0/ol-7/rootfs/run.sh
new file mode 100755
index 000000000000..dfff590ade3d
--- /dev/null
+++ b/bitnami/chartmuseum/0/ol-7/rootfs/run.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+#set -o xtrace # Uncomment this line for debugging purpose
+# shellcheck disable=SC1091
+
+# Load libraries
+. /liblog.sh
+
+FLAGS=''
+
+if [[ -d "/bitnami/certs" ]]; then
+    FLAGS='--tls-cert /bitnami/certs/server.crt --tls-key /bitnami/certs/server.key'
+fi
+
+if [[ -z ${STORAGE:-} ]]; then
+   info "Using local storage into /bitnami/data directory"
+   STORAGE='local'
+   STORAGE_LOCAL_ROOTDIR='/bitnami/data'
+   FLAGS="$FLAGS --storage $STORAGE --storage-local-rootdir $STORAGE_LOCAL_ROOTDIR"
+ fi
+
+ info "** Starting chartmuseum **"
+ exec /opt/bitnami/chartmuseum/bin/chartmuseum $FLAGS
diff --git a/bitnami/chartmuseum/0/ol-7/rootfs/setup.sh b/bitnami/chartmuseum/0/ol-7/rootfs/setup.sh
new file mode 100755
index 000000000000..24bc77d59e77
--- /dev/null
+++ b/bitnami/chartmuseum/0/ol-7/rootfs/setup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purpose
+# shellcheck disable=SC1091
+
+# Load libraries
+. /liblog.sh
+
+chart_museum_validate() {
+  info "Validating ChartMuseum parameters"
+
+  if [[ -z ${STORAGE:-} ]]; then
+    warn "No storage type provided, a local storage will be used"
+  fi
+
+  if ! [[ -d "/bitnami/certs" ]]; then
+    warn "No certificates provided, an insecure connection will be used"
+  fi
+}
+
+chart_museum_validate