diff --git a/Dockerfile b/Dockerfile
index 0ec7c314eec93fa50aa8529ff7079fe8929f8f25..84dba4890c7b846b13a7a018f1c10d3a801d0fd7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-
-ARG BASE_REGISTRY=registry1.dsop.io/ironbank
-ARG BASE_IMAGE=redhat/openjdk/openjdk11
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
 ARG BASE_TAG=1.11
 
 FROM tchiotludo/akhq:0.17.0 as base
diff --git a/README.md b/README.md
index 15402c5188af2c33fd7d9e41d089cf9b3c4264c3..ee049db0e423c1e638c9683d768f6688374a4d16 100644
--- a/README.md
+++ b/README.md
@@ -650,7 +650,7 @@ Documentation on Confluent 5.5 and schema references can be found [here](https:/
 
 ## Credits
 
-Many thanks to:
+Many thanks to:  
 
 * [JetBrains](https://www.jetbrains.com/?from=AKHQ) for their free OpenSource license.
 * Apache, Apache Kafka, Kafka, and associated open source project names are trademarks of the Apache Software Foundation. AKHQ is not affiliated with, endorsed by, or otherwise associated with the Apache Software.
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ef7ff08540cfe4e93a9e429e093c94e6391ac27e
--- /dev/null
+++ b/scripts/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+ #!/usr/bin/env sh
+
+set -e
+
+if [ "${AKHQ_CONFIGURATION}" ]; then
+    echo "${AKHQ_CONFIGURATION}" > /app/application.yml
+fi
+
+exec "$@"
\ No newline at end of file