diff --git a/Makefile b/Makefile
index e101256c..4271ae60 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ ifeq ($(DOCKER),)
 DOCKER=docker
 endif
 QUAY_REPO=stackrox-io
+ROX_CI_IMAGE_VERSION=$(shell git describe --tags --abbrev=10)
+ROX_CI_IMAGE_GIT_COMMIT=$(shell git rev-parse HEAD)
 
 STACKROX_BUILD_TAG=$(shell scripts/get_tag.sh "stackrox-build")
 
@@ -9,6 +11,8 @@ STACKROX_BUILD_TAG=$(shell scripts/get_tag.sh "stackrox-build")
 stackrox-build-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_BUILD_TAG) \
 		-f images/stackrox-build.Dockerfile \
 		images/
@@ -19,8 +23,10 @@ STACKROX_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-test")
 stackrox-test-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
-		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		--build-arg BASE_TAG=$(STACKROX_BUILD_TAG) \
+		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_TEST_TAG) \
 		-f images/stackrox-test.Dockerfile \
 		images/
 
@@ -30,8 +36,10 @@ STACKROX_UI_TEST_TAG=$(shell scripts/get_tag.sh "stackrox-ui-test")
 stackrox-ui-test-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
-		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		--build-arg BASE_TAG=$(STACKROX_UI_TEST_TAG) \
+		-t quay.io/$(QUAY_REPO)/apollo-ci:$(STACKROX_UI_TEST_TAG) \
 		-f images/stackrox-ui-test.Dockerfile \
 		images/
 
@@ -51,6 +59,8 @@ test-cci-export:
 scanner-build-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-build") \
 		-f images/scanner-build.Dockerfile \
 		images/
@@ -59,6 +69,8 @@ scanner-build-image:
 scanner-test-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		--build-arg BASE_TAG=$(shell scripts/get_tag.sh "scanner-build") \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-test") \
 		-f images/scanner-test.Dockerfile \
@@ -68,6 +80,8 @@ scanner-test-image:
 jenkins-plugin-image:
 	$(DOCKER) build \
 		--platform linux/amd64 \
+		--build-arg ROX_CI_IMAGE_VERSION=$(ROX_CI_IMAGE_VERSION) \
+		--build-arg ROX_CI_IMAGE_GIT_COMMIT=$(ROX_CI_IMAGE_GIT_COMMIT) \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "jenkins-plugin") \
 		-f images/jenkins-plugin.Dockerfile \
 		images/
diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile
index ff566700..2a09711e 100644
--- a/images/scanner-build.Dockerfile
+++ b/images/scanner-build.Dockerfile
@@ -62,4 +62,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --
     rm ossls_linux_amd64 && \
     ossls version
 
+ARG ROX_CI_IMAGE_VERSION=unknown
+ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
+RUN { \
+    echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
+    echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
+    echo "gcc=$(gcc --version)"; \
+    echo "go=$(go version)"; \
+    echo "make=$(make --version)"; \
+    } > /i-am-rox-ci-image
+
 WORKDIR /go/src/github.com/stackrox/scanner
diff --git a/images/scanner-test.Dockerfile b/images/scanner-test.Dockerfile
index dd8970e5..24ce54e8 100644
--- a/images/scanner-test.Dockerfile
+++ b/images/scanner-test.Dockerfile
@@ -107,6 +107,20 @@ RUN set -ex \
   && install hub-comment_linux_amd64 /usr/bin/hub-comment \
   && command -v hub-comment
 
+ARG ROX_CI_IMAGE_VERSION=unknown
+ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
+RUN { \
+    echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
+    echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
+    echo "docker=$(docker version)"; \
+    echo "gcloud=$(gcloud version)"; \
+    echo "go=$(go version)"; \
+    echo "helm=$(helm version)"; \
+    echo "kubectl=$(kubectl version --client)"; \
+    echo "oc=$(oc version --client)"; \
+    echo "yq=$(yq --version)"; \
+    } > /i-am-rox-ci-image
+
 RUN \
 	mv /bin/bash /bin/real-bash && \
 	mv /bin/bash-wrapper /bin/bash
diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile
index fce437c5..42e0519d 100644
--- a/images/stackrox-build.Dockerfile
+++ b/images/stackrox-build.Dockerfile
@@ -83,4 +83,14 @@ RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --
 
 ENV CGO_ENABLED=1
 
+ARG ROX_CI_IMAGE_VERSION=unknown
+ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
+RUN { \
+    echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
+    echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
+    echo "gcc=$(gcc --version)"; \
+    echo "go=$(go version)"; \
+    echo "make=$(make --version)"; \
+    } > /i-am-rox-ci-image
+
 WORKDIR /go/src/github.com/stackrox/rox
diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile
index ef13ebd4..e0963c8f 100644
--- a/images/stackrox-test.Dockerfile
+++ b/images/stackrox-test.Dockerfile
@@ -167,6 +167,26 @@ RUN set -ex \
 # Install roxie.
 COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
 
+ARG ROX_CI_IMAGE_VERSION=unknown
+ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
+RUN { \
+    echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
+    echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
+    echo "aws=$(aws --version)"; \
+    echo "docker=$(docker version)"; \
+    echo "gcloud=$(gcloud version)"; \
+    echo "go=$(go version)"; \
+    echo "gradle=$(gradle --version)"; \
+    echo "helm=$(helm version)"; \
+    echo "java=$(java -version 2>&1)"; \
+    echo "kubectl=$(kubectl version --client)"; \
+    echo "oc=$(oc version --client)"; \
+    echo "roxie=$(roxie version)"; \
+    echo "shellcheck=$(shellcheck --version)"; \
+    echo "vault=$(vault --version)"; \
+    echo "yq=$(yq --version)"; \
+    } > /i-am-rox-ci-image
+
 RUN \
 	mv /bin/bash /bin/real-bash && \
 	mv /bin/bash-wrapper /bin/bash
diff --git a/images/stackrox-ui-test.Dockerfile b/images/stackrox-ui-test.Dockerfile
index a927be7b..639bb788 100644
--- a/images/stackrox-ui-test.Dockerfile
+++ b/images/stackrox-ui-test.Dockerfile
@@ -219,6 +219,29 @@ RUN set -ex \
 # Install roxie.
 COPY --from=roxie-installer /usr/local/bin/roxie /usr/bin/roxie
 
+ARG ROX_CI_IMAGE_VERSION=unknown
+ARG ROX_CI_IMAGE_GIT_COMMIT=unknown
+RUN { \
+    echo "rox-ci-image-version=${ROX_CI_IMAGE_VERSION}"; \
+    echo "rox-ci-image-revision=${ROX_CI_IMAGE_GIT_COMMIT}"; \
+    echo "aws=$(aws --version)"; \
+    echo "bats=$(bats --version)"; \
+    echo "docker=$(docker version)"; \
+    echo "gcloud=$(gcloud version)"; \
+    echo "go=$(go version)"; \
+    echo "gradle=$(gradle --version)"; \
+    echo "helm=$(helm version)"; \
+    echo "java=$(java -version 2>&1)"; \
+    echo "kubectl=$(kubectl version --client)"; \
+    echo "node=$(node --version)"; \
+    echo "oc=$(oc version --client)"; \
+    echo "roxie=$(roxie version)"; \
+    echo "shellcheck=$(shellcheck --version)"; \
+    echo "vault=$(vault --version)"; \
+    echo "yarn=$(yarn --version)"; \
+    echo "yq=$(yq --version)"; \
+    } > /i-am-rox-ci-image
+
 RUN \
 	mv /bin/bash /bin/real-bash && \
 	mv /bin/bash-wrapper /bin/bash