diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eaa51c37..95bf736f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ concurrency:
 
 # Actual build/deploy logic
 jobs:
-  # Build maven stuff
+  # Build maven and docker stuff
   build:
     name: Build/Deploy Maven & Docker Artifacts
     runs-on: ubuntu-latest
diff --git a/conforming/README.md b/conforming/README.md
index 3539412d..40fbc6dd 100644
--- a/conforming/README.md
+++ b/conforming/README.md
@@ -120,9 +120,12 @@ Project home: https://projects.eclipse.org/projects/automotive.tractusx
 Dockerfile: https://github.com/eclipse-tractusx/knowledge-agents/blob/main/conforming/src/main/docker/Dockerfile
 Project license: Apache License, Version 2.0
 
-Used base image
+**Used base image**
 
-[eclipse-temurin:17-jre-alpine](https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=17-jre-alpine) 
+- [eclipse-temurin:17-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
 
 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
 
diff --git a/provisioning/README.md b/provisioning/README.md
index 026c335d..e3803c7d 100644
--- a/provisioning/README.md
+++ b/provisioning/README.md
@@ -275,9 +275,12 @@ Project home: https://projects.eclipse.org/projects/automotive.tractusx
 Dockerfile: https://github.com/eclipse-tractusx/knowledge-agents/blob/main/provisioning/src/main/docker/Dockerfile
 Project license: Apache License, Version 2.0
 
-Used base image
+**Used base image**
 
-[ontop/ontop:5.0.2](https://hub.docker.com/r/ontop/ontop/tags?page=1&name=5.0.2)
+- [ontop/ontop:5.0.2](https://github.com/ontop/ontop/tree/version5/client/docker)
+- Official Ontop DockerHub page: https://hub.docker.com/u/ontop
+- Ontop Project: https://ontop-vkg.org
+- Additional information about the Ontop image: https://hub.docker.com/r/ontop/ontop
 
 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
 
diff --git a/remoting/README.md b/remoting/README.md
index 49fd91f4..0121f515 100644
--- a/remoting/README.md
+++ b/remoting/README.md
@@ -202,9 +202,12 @@ Project home: https://projects.eclipse.org/projects/automotive.tractusx
 Dockerfile: https://github.com/eclipse-tractusx/knowledge-agents/blob/main/remoting/src/main/docker/Dockerfile
 Project license: Apache License, Version 2.0
 
-Used base image
+**Used base image**
 
-[tomcat:9-jre11-temurin](https://hub.docker.com/_/tomcat/tags?page=1&name=9-jre11-temurin)
+- [tomcat:9-jre11-temurin](https://github.com/docker-library/tomcat/tree/master/9.0/jre11/temurin-jammy)
+- Official Tomcat Dockerhub page: https://hub.docker.com/_/tomcat
+- Apache Tomcat Project: https://tomcat.apache.org/
+- Additional information about the Tomcat image: https://github.com/docker-library/repo-info/tree/master/repos/tomcat
 
 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).