diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb7de53..ebcc8db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Not released yet
+- [PR-33](https://github.com/malaskowski/aet-docker/pull/33) - Update BrowserMob Proxy image to the version without log4jshell vulnerability.
 - [PR-34](https://github.com/malaskowski/aet-docker/pull/34) - build custom version of Apache Karaf 4.2.0 with updated pax.logging dependencies.
 
 # 1.0.0
diff --git a/browsermob/Dockerfile b/browsermob/Dockerfile
index d386b1c..84b25e5 100644
--- a/browsermob/Dockerfile
+++ b/browsermob/Dockerfile
@@ -16,13 +16,32 @@
 # limitations under the License.
 #
 
-FROM openjdk:8-alpine
+FROM maven:3.8.4-jdk-8 as builder
+RUN apt-get update \
+    && apt-get install git unzip tzdata \
+    && update-ca-certificates
+
+# Clone BMP Proxy fork with log4j fix, see https://github.com/lightbody/browsermob-proxy/pull/891
+RUN mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
+ && git clone git://github.com/cyberstormdotmu/browsermob-proxy.git \
+ && cd browsermob-proxy \
+ && git reset --hard 6e4afc39c7904f361a712dccff739fa9845cebdc \
+ && git status
+ 
+WORKDIR /browsermob-proxy
+RUN mvn clean install -DskipTests
+
+#################################################################################
+
+FROM openjdk:8-alpine as final
 LABEL maintainer="Maciej Laskowski <https://github.com/malaskowski>"
 
-# Set the build params
-ARG BMP_VERSION="2.1.4"
-ARG BMP_DOWNLOAD_SHA256="27c4080411adff919586e909c664c73bebb8ba8bfcaea259ce58327222e5e8fb"
-ARG DOWNLOAD_URL="https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-${BMP_VERSION}/browsermob-proxy-${BMP_VERSION}-bin.zip"
+# Until https://github.com/lightbody/browsermob-proxy/pull/891 is not merged and new BMP released
+# Clone the repo with log4j update and build
+# # Set the build params
+# ARG BMP_VERSION="2.1.4"
+# ARG BMP_DOWNLOAD_SHA256="27c4080411adff919586e909c664c73bebb8ba8bfcaea259ce58327222e5e8fb"
+# ARG DOWNLOAD_URL="https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-${BMP_VERSION}/browsermob-proxy-${BMP_VERSION}-bin.zip"
 
 # make sure system is up-to-date
 RUN apk update \
@@ -30,10 +49,18 @@ RUN apk update \
     && update-ca-certificates
 
 # download and install BMP
-RUN curl -fSL -o /tmp/browsermob-proxy.zip ${DOWNLOAD_URL} \
-    && echo "${BMP_DOWNLOAD_SHA256}  /tmp/browsermob-proxy.zip" |  sha256sum -c - \
-    && unzip /tmp/browsermob-proxy.zip -d / \
-    && mv /browsermob-proxy-${BMP_VERSION} /browsermob-proxy \
+# RUN curl -fSL -o /tmp/browsermob-proxy.zip ${DOWNLOAD_URL} \
+#     && echo "${BMP_DOWNLOAD_SHA256}  /tmp/browsermob-proxy.zip" |  sha256sum -c - \
+#     && unzip /tmp/browsermob-proxy.zip -d / \
+#     && mv /browsermob-proxy-${BMP_VERSION} /browsermob-proxy \
+#     && rm -f /tmp/browsermob-proxy.zip \
+#     && rm -rf /var/cache/apk/*
+
+COPY --from=builder /browsermob-proxy/browsermob-dist/target/browsermob-proxy-2.1.6-SNAPSHOT-bin.zip /tmp/
+
+# unzip and install BMP
+RUN unzip /tmp/browsermob-proxy-2.1.6-SNAPSHOT-bin.zip -d / \
+    && mv /browsermob-proxy-2.1.6-SNAPSHOT /browsermob-proxy \
     && rm -f /tmp/browsermob-proxy.zip \
     && rm -rf /var/cache/apk/*