diff --git a/Dockerfile b/Dockerfile
index 817a515103eabfefee04f250cf627b5f58615a14..6bba93b78720ee7581d5a7a0e9d38e2cc350828c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,22 +6,15 @@ FROM tchiotludo/akhq:0.16.0 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ENV LANG=C.UTF-8
-
-
 USER 0
 
 WORKDIR /app
 
-COPY --from=base /app/akhq.jar /app/akhq.jar
-
-COPY config/application.yml /app/application.yml 
-
-COPY scripts/akhq /app/akhq
+COPY --from=base /app/akhq.jar .
 
-COPY scripts/jvm.options /app/jvm.options
+COPY config/* .
 
-COPY scripts/entrypoint.sh /app/entrypoint.sh
+COPY scripts/* .
 
 ENV MICRONAUT_CONFIG_FILES=/app/application.yml
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index ac24524af948a5489eeaa0cdf9b3d6c81fb447e5..41f861d291ed9af98f4a51319f69c378fa53e325 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -29,7 +29,7 @@ labels:
   org.opencontainers.image.vendor: "opensource"
   org.opencontainers.image.version: "0.16.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
-  mil.dso.ironbank.image.keywords: "kafka-dashboard"
+  mil.dso.ironbank.image.keywords: "kafka-dashboard,dataflow,processing"
   ## This value can be "opensource" or "commercial"
   mil.dso.ironbank.image.type: "opensource"
   ## Product the image belongs to for grouping multiple images
@@ -41,15 +41,8 @@ resources:
   url: docker://docker.io/tchiotludo/akhq@sha256:44e00630f95b0a42c716f635b94cd53a7185aa6626502839f8afa8d8b35bf576
 
 # List of project maintainers
-# FIXME: Fill in the following details for the current container owner in the whitelist
-# FIXME: Include any other vendor information if applicable
 maintainers:
-- email: "jparekh@vivsoft.io"
-#   # The name of the current container owner
-  name: "Jinoy Parekh"
-#   # The gitlab username of the current container owner
+- name: "Jinoy Parekh"
   username: "jparekh"
-  cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
-# - name: "FIXME"
-#   username: "FIXME"
-#   email: "FIXME"
+  email: "jparekh@vivsoft.io"
+  cht_member: true 
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc9226c42ff6c6c45e4f3a86c8edb9c2123964e8
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,41 @@
+{
+  "assignees": [
+    "@jparekh"
+  ],
+  "baseBranches": [
+    "development"
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "kafka-dashboard",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "kafka-dashboard",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "kafka-dashboard",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
+
diff --git a/scripts/akhq b/scripts/akhq
index 1ec024e461db209898ba794be73c99a33f4e9726..3a4b946d825ed20b7b65e6259615eae6d51e1e43 100644
--- a/scripts/akhq
+++ b/scripts/akhq
@@ -1,11 +1,10 @@
 #!/usr/bin/env sh
 
 # Read user-defined JVM options from jvm.options file
-JVM_HOME="/usr/lib/jvm/java-11-openjdk-11.0.9.11-2.el8_3.x86_64/bin/java"
 JVM_OPTS_FILE=${JVM_OPTS_FILE:-/app/jvm.options}
 for JVM_OPT in `grep "^-" ${JVM_OPTS_FILE}`
 do
   JAVA_OPTS="${JAVA_OPTS} ${JVM_OPT}"
 done
 
-${JVM_HOME} ${JAVA_OPTS} -jar /app/akhq.jar
+java ${JAVA_OPTS} -jar /app/akhq.jar