diff --git a/Dockerfile b/Dockerfile
index 78dd2f5ca..a3f15d3f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM adoptopenjdk:8-jdk-openj9 AS GRADLE_BUILD
+FROM eclipse-temurin:8-jdk AS GRADLE_BUILD
 RUN mkdir -p ./build/libs/
 RUN curl -L http://search.maven.org/remotecontent?filepath=org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar -o ./jolokia-jvm-agent.jar
 COPY ./ ./
 RUN ./gradlew build
 
-FROM openjdk:8-jre
+FROM eclipse-temurin:8-jre
 COPY --from=GRADLE_BUILD ./build/libs/ /opt/firehose/bin
 COPY --from=GRADLE_BUILD ./jolokia-jvm-agent.jar /opt/firehose
 COPY --from=GRADLE_BUILD ./src/main/resources/log4j.xml /opt/firehose/etc/log4j.xml
diff --git a/build.gradle b/build.gradle
index ff49b9fff..f2c5fc530 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.7"
         classpath "org.ajoberstar:gradle-git:1.6.0"
     }
 }
@@ -33,7 +32,7 @@ lombok {
 }
 
 group 'org.raystack'
-version '0.8.0'
+version '0.8.1'
 
 def projName = "firehose"
 
@@ -87,7 +86,6 @@ dependencies {
     }
     implementation 'io.confluent:monitoring-interceptors:3.0.0'
     implementation 'io.grpc:grpc-all:1.53.0'
-    implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: '2.6.3'
     implementation group: 'com.google.gradle', name: 'osdetector-gradle-plugin', version: '1.2.1'
     implementation group: 'org.apache.ivy', name: 'ivy', version: '2.2.0'
     implementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.12.8'