diff --git a/Makefile b/Makefile
index c84b7e42a..5c6e64692 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,12 @@ REQUIRED_R_STUDIO_IMAGE_COMMANDS="curl python oc /usr/lib/rstudio-server/bin/rse
 define build_image
 	$(eval IMAGE_NAME := $(IMAGE_REGISTRY):$(1)-$(IMAGE_TAG))
 	$(info # Building $(IMAGE_NAME) image...)
+	$(eval BUILD_ARGS := --build-arg BUILD_COMMIT_REF=$(RELEASE) --build-arg IMAGE_REGISTRY=$(IMAGE_REGISTRY))
 	$(if $(3),
 		$(eval BASE_IMAGE_NAME := $(IMAGE_REGISTRY):$(3)-$(IMAGE_TAG))
-		$(eval BUILD_ARGS := --build-arg BASE_IMAGE=$(BASE_IMAGE_NAME)),
-		$(eval BUILD_ARGS :=)
+		$(eval BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(BASE_IMAGE_NAME)),
 	)
-	$(CONTAINER_ENGINE) build --no-cache  -t $(IMAGE_NAME) $(BUILD_ARGS) $(2)
+	$(CONTAINER_ENGINE) build --no-cache --tag $(IMAGE_NAME) $(BUILD_ARGS) $(2)
 endef
 
 # Push function for the notebok image:
diff --git a/base/c9s-python-3.9/Dockerfile b/base/c9s-python-3.9/Dockerfile
index b01a0dbae..0faeafac5 100644
--- a/base/c9s-python-3.9/Dockerfile
+++ b/base/c9s-python-3.9/Dockerfile
@@ -1,14 +1,19 @@
 FROM quay.io/sclorg/python-39-c9s:c9s
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-base-centos-stream9-python-3.9" \
       summary="Python 3.9 CentOS Stream 9 base image for ODH notebooks" \
       description="Base Python 3.9 builder image based on CentOS Stream 9 for ODH notebooks" \
       io.k9s.display-name="Python 3.9 c9s base image for ODH notebooks" \
       io.k9s.description="Base Python 3.9 builder image based on C9S for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/base/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/base/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-c9s-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/base/ubi8-python-3.8/Dockerfile b/base/ubi8-python-3.8/Dockerfile
index 82bc398d3..8cf04c21c 100644
--- a/base/ubi8-python-3.8/Dockerfile
+++ b/base/ubi8-python-3.8/Dockerfile
@@ -1,14 +1,19 @@
 FROM registry.access.redhat.com/ubi8/python-38:latest
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-base-ubi8-python-3.8" \
       summary="Python 3.8 base image for ODH notebooks" \
       description="Base Python 3.8 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="Python 3.8 base image for ODH notebooks" \
       io.k8s.description="Base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/base/ubi8-python-3.8" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-ubi8-python-3.8"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/base/ubi8-python-3.8" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/base/ubi9-python-3.9/Dockerfile b/base/ubi9-python-3.9/Dockerfile
index 9564d2499..38398042c 100644
--- a/base/ubi9-python-3.9/Dockerfile
+++ b/base/ubi9-python-3.9/Dockerfile
@@ -1,14 +1,19 @@
 FROM registry.access.redhat.com/ubi9/python-39:latest
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-base-ubi9-python-3.9" \
       summary="Python 3.9 base image for ODH notebooks" \
       description="Base Python 3.9 builder image based on UBI9 for ODH notebooks" \
       io.k9s.display-name="Python 3.9 base image for ODH notebooks" \
       io.k9s.description="Base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/base/ubi9-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-ubi9-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/base/ubi9-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/codeserver/c9s-python-3.9/Dockerfile b/codeserver/c9s-python-3.9/Dockerfile
index 9fa8a6cf7..ceae33336 100644
--- a/codeserver/c9s-python-3.9/Dockerfile
+++ b/codeserver/c9s-python-3.9/Dockerfile
@@ -1,6 +1,11 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 ARG CODESERVER_VERSION=v4.16.1
 
 LABEL name="odh-notebook-code-server-c9s-python-3.9" \
@@ -8,10 +13,10 @@ LABEL name="odh-notebook-code-server-c9s-python-3.9" \
       description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       io.k9s.display-name="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       io.k9s.description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/codeserver/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:codeserver-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/codeserver/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:codeserver-c9s-python-3.9"
 
 USER 0
 
diff --git a/cuda/c9s-python-3.9/Dockerfile b/cuda/c9s-python-3.9/Dockerfile
index 7139d8b23..18f91d5a9 100644
--- a/cuda/c9s-python-3.9/Dockerfile
+++ b/cuda/c9s-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-c9s-python-3.9" \
       summary="CUDA Python 3.9 base image for ODH notebooks" \
       description="CUDA Python 3.9 builder image based on CentOS Stream 9 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.9 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.9 builder image based on C9S for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/cuda/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/cuda/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:cuda-c9s-python-3.9"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/base/Dockerfile
diff --git a/cuda/ubi8-python-3.8/Dockerfile b/cuda/ubi8-python-3.8/Dockerfile
index 9cd82c8b7..4ca0e7900 100644
--- a/cuda/ubi8-python-3.8/Dockerfile
+++ b/cuda/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-ubi8-python-3.8" \
       summary="CUDA Python 3.8 base image for ODH notebooks" \
       description="CUDA Python 3.8 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.8 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.8 builder image based on UBI8 for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/cuda/ubi8-python-3.8" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-ubi8-python-3.8"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/cuda/ubi8-python-3.8" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:cuda-ubi8-python-3.8"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.4.2/ubi8/base/Dockerfile
diff --git a/cuda/ubi9-python-3.9/Dockerfile b/cuda/ubi9-python-3.9/Dockerfile
index b7c560e79..fcb9a03cd 100644
--- a/cuda/ubi9-python-3.9/Dockerfile
+++ b/cuda/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-ubi9-python-3.9" \
       summary="CUDA Python 3.9 base image for ODH notebooks" \
       description="CUDA Python 3.9 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.9 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.9 builder image based on UBI8 for ODH notebooks" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/cuda/ubi9-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-ubi9-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/cuda/ubi9-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:cuda-ubi9-python-3.9"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/base/Dockerfile
diff --git a/habana/1.10.0/ubi8-python-3.8/Dockerfile b/habana/1.10.0/ubi8-python-3.8/Dockerfile
index 411573ddf..1dcd9e78f 100644
--- a/habana/1.10.0/ubi8-python-3.8/Dockerfile
+++ b/habana/1.10.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,11 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.10.0"
 ARG REVISION="494"
@@ -147,10 +152,10 @@ LABEL name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.10.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.10.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.10.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/habana/1.10.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.10.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/habana/1.10.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.10.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
diff --git a/habana/1.11.0/ubi8-python-3.8/Dockerfile b/habana/1.11.0/ubi8-python-3.8/Dockerfile
index 45873d215..5d8939805 100644
--- a/habana/1.11.0/ubi8-python-3.8/Dockerfile
+++ b/habana/1.11.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,11 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.11.0"
 ARG REVISION="587"
@@ -151,10 +156,10 @@ LABEL name="odh-notebook-habana-jupyter-1.11.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.11.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.11.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.11.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/habana/1.11.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.11.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/habana/1.11.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.11.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
diff --git a/habana/1.9.0/ubi8-python-3.8/Dockerfile b/habana/1.9.0/ubi8-python-3.8/Dockerfile
index 90bb1b31f..5c9f6972f 100644
--- a/habana/1.9.0/ubi8-python-3.8/Dockerfile
+++ b/habana/1.9.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,11 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.9.0"
 ARG REVISION="580"
@@ -136,10 +141,10 @@ LABEL name="odh-notebook-habana-jupyter-1.9.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.9.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.9.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.9.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/habana/1.9.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.9.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/habana/1.9.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.9.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
diff --git a/jupyter/datascience/anaconda-python-3.8/Dockerfile b/jupyter/datascience/anaconda-python-3.8/Dockerfile
index f62807860..5612de31b 100644
--- a/jupyter/datascience/anaconda-python-3.8/Dockerfile
+++ b/jupyter/datascience/anaconda-python-3.8/Dockerfile
@@ -1,6 +1,11 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="jupyter-datascience-anaconda-python-3.8:latest" \
     summary="Minimal Jupyter Notebook Source-to-Image for Python 3.8 applications. Uses Anaconda CE instead of pip." \
     description="Notebook image based on Anaconda CE Python.These images can be used in OpenDatahub JupterHub." \
@@ -8,10 +13,10 @@ LABEL name="jupyter-datascience-anaconda-python-3.8:latest" \
     io.k8s.display-name="Anaconda s2i-minimal-notebook, python38" \
     io.openshift.expose-services="8888:http" \
     io.openshift.tags="python,python38,python-38,anaconda-python38" \
-    authoritative-source-url="https://quay.io//opendatahub/workbench-images:jupyter-datascience-anaconda-python-3.8" \
-    io.openshift.s2i.build.commit.ref="main" \
-    io.openshift.s2i.build.source-location="https://github.com/opendatahub-io/notebooks/jupyter/datascience/anaconda-python-3.8" \
-    io.openshift.s2i.build.image="quay.io/repository/opendatahub/workbench-images:jupyter-datascience-anaconda-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.s2i.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.s2i.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/datascience/anaconda-python-3.8" \
+    io.openshift.s2i.build.image="${IMAGE_REGISTRY}:jupyter-datascience-anaconda-python-3.8"
 
 ENV JUPYTER_ENABLE_LAB="1"
 USER root
diff --git a/jupyter/datascience/ubi8-python-3.8/Dockerfile b/jupyter/datascience/ubi8-python-3.8/Dockerfile
index 527ead8ac..5edf449e1 100644
--- a/jupyter/datascience/ubi8-python-3.8/Dockerfile
+++ b/jupyter/datascience/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-datascience-ubi8-python-3.8" \
     summary="Jupyter data science notebook image for ODH notebooks" \
     description="Jupyter data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Jupyter data science notebook image for ODH notebooks" \
     io.k8s.description="Jupyter data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/datascience/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-datascience-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/datascience/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-datascience-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/jupyter/datascience/ubi9-python-3.9/Dockerfile b/jupyter/datascience/ubi9-python-3.9/Dockerfile
index acda97499..b8fe6bc90 100644
--- a/jupyter/datascience/ubi9-python-3.9/Dockerfile
+++ b/jupyter/datascience/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-datascience-ubi9-python-3.9" \
     summary="Jupyter data science notebook image for ODH notebooks" \
     description="Jupyter data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter data science notebook image for ODH notebooks" \
     io.k8s.description="Jupyter data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/datascience/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-datascience-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/datascience/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-datascience-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/jupyter/minimal/ubi8-python-3.8/Dockerfile b/jupyter/minimal/ubi8-python-3.8/Dockerfile
index e8c3d4c9b..d240ce069 100644
--- a/jupyter/minimal/ubi8-python-3.8/Dockerfile
+++ b/jupyter/minimal/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-minimal-ubi8-python-3.8" \
     summary="Minimal Jupyter notebook image for ODH notebooks" \
     description="Minimal Jupyter notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Minimal Jupyter notebook image for ODH notebooks" \
     io.k8s.description="Minimal Jupyter notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/minimal/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-minimal-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/minimal/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-minimal-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/jupyter/minimal/ubi9-python-3.9/Dockerfile b/jupyter/minimal/ubi9-python-3.9/Dockerfile
index fdde87df0..8153609da 100644
--- a/jupyter/minimal/ubi9-python-3.9/Dockerfile
+++ b/jupyter/minimal/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-minimal-ubi9-python-3.9" \
     summary="Minimal Jupyter notebook image for ODH notebooks" \
     description="Minimal Jupyter notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k9s.display-name="Minimal Jupyter notebook image for ODH notebooks" \
     io.k9s.description="Minimal Jupyter notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/minimal/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-minimal-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/minimal/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-minimal-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/jupyter/pytorch/ubi9-python-3.9/Dockerfile b/jupyter/pytorch/ubi9-python-3.9/Dockerfile
index ab479af68..37442e605 100644
--- a/jupyter/pytorch/ubi9-python-3.9/Dockerfile
+++ b/jupyter/pytorch/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-pytorch-ubi9-python-3.9" \
     summary="Jupyter pytorch notebook image for ODH notebooks" \
     description="Jupyter pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter pytorch notebook image for ODH notebooks" \
     io.k8s.description="Jupyter pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/pytorch/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-pytorch-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/pytorch/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-pytorch-ubi9-python-3.9"
 
 # Install Python packages and Jupyterlab extensions from Pipfile.lock
 COPY Pipfile.lock ./
diff --git a/jupyter/tensorflow/ubi9-python-3.9/Dockerfile b/jupyter/tensorflow/ubi9-python-3.9/Dockerfile
index c7e41f8d2..9f1da0f18 100644
--- a/jupyter/tensorflow/ubi9-python-3.9/Dockerfile
+++ b/jupyter/tensorflow/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9" \
     summary="Jupyter CUDA tensorflow notebook image for ODH notebooks" \
     description="Jupyter CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter CUDA tensorflow notebook image for ODH notebooks" \
     io.k8s.description="Jupyter CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/tensorflow/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-jupyter-tensorflow-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/tensorflow/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:cuda-jupyter-tensorflow-ubi9-python-3.9"
 
 # Install Python packages and Jupyterlab extensions from Pipfile.lock
 COPY Pipfile.lock ./
diff --git a/jupyter/trustyai/ubi8-python-3.8/Dockerfile b/jupyter/trustyai/ubi8-python-3.8/Dockerfile
index 7b0bad4e7..4d26d1ee5 100644
--- a/jupyter/trustyai/ubi8-python-3.8/Dockerfile
+++ b/jupyter/trustyai/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-trustyai-ubi8-python-3.8" \
     summary="Jupyter trustyai notebook image for ODH notebooks" \
     description="Jupyter trustyai notebook image with base Python 3.8 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter trustyai notebook image for ODH notebooks" \
     io.k8s.description="Jupyter trustyai notebook image with base Python 3.8 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/trustyai/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-trustyai-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/trustyai/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-trustyai-ubi8-python-3.8"
 
 USER 0
 
diff --git a/jupyter/trustyai/ubi9-python-3.9/Dockerfile b/jupyter/trustyai/ubi9-python-3.9/Dockerfile
index 0d0f91d65..029da80f4 100644
--- a/jupyter/trustyai/ubi9-python-3.9/Dockerfile
+++ b/jupyter/trustyai/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-jupyter-trustyai-ubi9-python-3.9" \
     summary="Jupyter trustyai notebook image for ODH notebooks" \
     description="Jupyter trustyai notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter trustyai notebook image for ODH notebooks" \
     io.k8s.description="Jupyter trustyai notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/trustyai/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-trustyai-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/jupyter/trustyai/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-trustyai-ubi9-python-3.9"
 
 USER 0
 
diff --git a/rstudio/c9s-python-3.9/Dockerfile b/rstudio/c9s-python-3.9/Dockerfile
index a8d44a824..b59532e70 100644
--- a/rstudio/c9s-python-3.9/Dockerfile
+++ b/rstudio/c9s-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-rstudio-c9s-python-3.9" \
       summary="R Studio image with python 3.9 based on CentOS Stream 9" \
       description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       io.k9s.display-name="R Studio image with python 3.9 based on CentOS Stream 9" \
       io.k9s.description="R Studio image with python 3.9 based on CentOS Stream 9" \
-      authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-      io.openshift.build.commit.ref="main" \
-      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/rstudio/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:rstudio-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/rstudio/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:rstudio-c9s-python-3.9"
 
 USER 0
 
diff --git a/runtimes/datascience/ubi8-python-3.8/Dockerfile b/runtimes/datascience/ubi8-python-3.8/Dockerfile
index d3e60cadb..ca9625031 100644
--- a/runtimes/datascience/ubi8-python-3.8/Dockerfile
+++ b/runtimes/datascience/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-datascience-ubi8-python-3.8" \
     summary="Runtime data science notebook image for ODH notebooks" \
     description="Runtime data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Runtime data science notebook image for ODH notebooks" \
     io.k8s.description="Runtime data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/datascience/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-datascience-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/datascience/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-datascience-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/datascience/ubi9-python-3.9/Dockerfile b/runtimes/datascience/ubi9-python-3.9/Dockerfile
index bda475d9a..4a4094d9f 100644
--- a/runtimes/datascience/ubi9-python-3.9/Dockerfile
+++ b/runtimes/datascience/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-datascience-ubi9-python-3.9" \
     summary="Runtime data science notebook image for ODH notebooks" \
     description="Runtime data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Runtime data science notebook image for ODH notebooks" \
     io.k8s.description="Runtime data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/datascience/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-datascience-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/datascience/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-datascience-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/minimal/ubi8-python-3.8/Dockerfile b/runtimes/minimal/ubi8-python-3.8/Dockerfile
index fa922afae..36b56dd5d 100644
--- a/runtimes/minimal/ubi8-python-3.8/Dockerfile
+++ b/runtimes/minimal/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-minimal-ubi8-python-3.8" \
     summary="Runtime minimal image for ODH notebooks" \
     description="Runtime minimal image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Runtime minimal image for ODH notebooks" \
     io.k8s.description="Runtime minimal image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/minimal/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-minimal-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/minimal/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-minimal-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/minimal/ubi9-python-3.9/Dockerfile b/runtimes/minimal/ubi9-python-3.9/Dockerfile
index 2959f286b..b548c6614 100644
--- a/runtimes/minimal/ubi9-python-3.9/Dockerfile
+++ b/runtimes/minimal/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-minimal-ubi9-python-3.9" \
     summary="Runtime minimal image for ODH notebooks" \
     description="Runtime minimal image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Runtime minimal image for ODH notebooks" \
     io.k8s.description="Runtime minimal image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/minimal/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-minimal-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/minimal/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-minimal-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/pytorch/ubi8-python-3.8/Dockerfile b/runtimes/pytorch/ubi8-python-3.8/Dockerfile
index e62fb55a0..92d6fc63f 100644
--- a/runtimes/pytorch/ubi8-python-3.8/Dockerfile
+++ b/runtimes/pytorch/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-pytorch-ubi8-python-3.8" \
     summary="Runtime pytorch notebook image for ODH notebooks" \
     description="Runtime pytorch notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Runtime pytorch notebook image for ODH notebooks" \
     io.k8s.description="Runtime pytorch notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/pytorch/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-pytorch-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/pytorch/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-pytorch-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/pytorch/ubi9-python-3.9/Dockerfile b/runtimes/pytorch/ubi9-python-3.9/Dockerfile
index 871401e28..c046309ec 100644
--- a/runtimes/pytorch/ubi9-python-3.9/Dockerfile
+++ b/runtimes/pytorch/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-runtime-pytorch-ubi9-python-3.9" \
     summary="Runtime pytorch notebook image for ODH notebooks" \
     description="Runtime pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Runtime pytorch notebook image for ODH notebooks" \
     io.k8s.description="Runtime pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/pytorch/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-pytorch-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/pytorch/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:runtime-pytorch-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/tensorflow/ubi8-python-3.8/Dockerfile b/runtimes/tensorflow/ubi8-python-3.8/Dockerfile
index 30a84b128..cf011aacb 100644
--- a/runtimes/tensorflow/ubi8-python-3.8/Dockerfile
+++ b/runtimes/tensorflow/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-runtime-tensorflow-ubi8-python-3.8" \
     summary="Runtime CUDA tensorflow notebook image for ODH notebooks" \
     description="Runtime CUDA tensorflow notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Runtime CUDA tensorflow notebook image for ODH notebooks" \
     io.k8s.description="Runtime CUDA tensorflow notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/tensorflow/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-runtime-tensorflow-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/tensorflow/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:cuda-runtime-tensorflow-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/tensorflow/ubi9-python-3.9/Dockerfile b/runtimes/tensorflow/ubi9-python-3.9/Dockerfile
index 6f8412bf3..57e777fbe 100644
--- a/runtimes/tensorflow/ubi9-python-3.9/Dockerfile
+++ b/runtimes/tensorflow/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,20 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
+ARG AUTHORITATIVE_SOURCE_URL="https://github.com/opendatahub-io/notebooks"
+
 LABEL name="odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.9" \
     summary="Runtime CUDA tensorflow notebook image for ODH notebooks" \
     description="Runtime CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Runtime CUDA tensorflow notebook image for ODH notebooks" \
     io.k8s.description="Runtime CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
-    io.openshift.build.commit.ref="main" \
-    io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/runtimes/tensorflow/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-runtime-tensorflow-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/main/runtimes/tensorflow/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:cuda-runtime-tensorflow-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin