diff --git a/Makefile b/Makefile
index c84b7e42a..a23c0ed73 100644
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,11 @@ runtime-pytorch-ubi9-python-3.9: base-ubi9-python-3.9
 runtime-cuda-tensorflow-ubi9-python-3.9: cuda-ubi9-python-3.9
 	$(call image,$@,runtimes/tensorflow/ubi9-python-3.9,$<)
 
+.PHONY: codeserver-ubi9-python-3.9
+codeserver-ubi9-python-3.9: base-ubi9-python-3.9
+	$(call image,$@,codeserver/ubi9-python-3.9,$<)
+
+
 ####################################### Buildchain for Python 3.9 using C9S #######################################
 
 # Build and push base-c9s-python-3.9 image to the registry
@@ -194,10 +199,6 @@ base-c9s-python-3.9:
 cuda-c9s-python-3.9: base-c9s-python-3.9
 	$(call image,$@,cuda/c9s-python-3.9,$<)
 
-.PHONY: codeserver-c9s-python-3.9
-codeserver-c9s-python-3.9: base-c9s-python-3.9
-	$(call image,$@,codeserver/c9s-python-3.9,$<)
-
 .PHONY: rstudio-c9s-python-3.9
 rstudio-c9s-python-3.9: base-c9s-python-3.9
 	$(call image,$@,rstudio/c9s-python-3.9,$<)
diff --git a/codeserver/c9s-python-3.9/Dockerfile b/codeserver/ubi9-python-3.9/Dockerfile
similarity index 93%
rename from codeserver/c9s-python-3.9/Dockerfile
rename to codeserver/ubi9-python-3.9/Dockerfile
index d2153d44e..d75c89ec9 100644
--- a/codeserver/c9s-python-3.9/Dockerfile
+++ b/codeserver/ubi9-python-3.9/Dockerfile
@@ -3,15 +3,15 @@ FROM ${BASE_IMAGE}
 
 ARG CODESERVER_VERSION=v4.16.1
 
-LABEL name="odh-notebook-code-server-c9s-python-3.9" \
-      summary="Code Server (VS Code) 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.k8s.display-name="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
-      io.k8s.description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
+LABEL name="odh-notebook-code-server-ubi9-python-3.9" \
+      summary="Code Server (VS Code) image with python 3.9 based on UBI 9" \
+      description="Code Server (VS Code) image with python 3.9 based on UBI9" \
+      io.k8s.display-name="Code Server (VS Code) image with python 3.9 based on UBI9" \
+      io.k8s.description="Code Server (VS Code) image with python 3.9 based on UBI9" \
       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"
+      io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/codeserver/ubi9-python-3.9" \
+      io.openshift.build.image="quay.io/opendatahub/workbench-images:codeserver-ubi9-python-3.9"
 
 USER 0
 
diff --git a/codeserver/c9s-python-3.9/kustomize/base/kustomization.yaml b/codeserver/ubi9-python-3.9/kustomize/base/kustomization.yaml
similarity index 84%
rename from codeserver/c9s-python-3.9/kustomize/base/kustomization.yaml
rename to codeserver/ubi9-python-3.9/kustomize/base/kustomization.yaml
index 9c4164321..ac2cf5124 100644
--- a/codeserver/c9s-python-3.9/kustomize/base/kustomization.yaml
+++ b/codeserver/ubi9-python-3.9/kustomize/base/kustomization.yaml
@@ -7,4 +7,4 @@ resources:
 images:
   - name: codeserver-workbench
     newName: quay.io/opendatahub/workbench-images
-    newTag: codeserver-c9s-python-3.9
+    newTag: codeserver-ubi9-python-3.9
diff --git a/codeserver/c9s-python-3.9/kustomize/base/pod.yaml b/codeserver/ubi9-python-3.9/kustomize/base/pod.yaml
similarity index 100%
rename from codeserver/c9s-python-3.9/kustomize/base/pod.yaml
rename to codeserver/ubi9-python-3.9/kustomize/base/pod.yaml
diff --git a/codeserver/c9s-python-3.9/nginx/api/kernels/access.cgi b/codeserver/ubi9-python-3.9/nginx/api/kernels/access.cgi
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/api/kernels/access.cgi
rename to codeserver/ubi9-python-3.9/nginx/api/kernels/access.cgi
diff --git a/codeserver/c9s-python-3.9/nginx/httpconf/http.conf b/codeserver/ubi9-python-3.9/nginx/httpconf/http.conf
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/httpconf/http.conf
rename to codeserver/ubi9-python-3.9/nginx/httpconf/http.conf
diff --git a/codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/generate_container_user b/codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/generate_container_user
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/generate_container_user
rename to codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/generate_container_user
diff --git a/codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/passwd.template b/codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/passwd.template
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/passwd.template
rename to codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/passwd.template
diff --git a/codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/scl_enable b/codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/scl_enable
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/root/opt/app-root/etc/scl_enable
rename to codeserver/ubi9-python-3.9/nginx/root/opt/app-root/etc/scl_enable
diff --git a/codeserver/c9s-python-3.9/nginx/root/opt/app-root/nginxconf.sed b/codeserver/ubi9-python-3.9/nginx/root/opt/app-root/nginxconf.sed
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/root/opt/app-root/nginxconf.sed
rename to codeserver/ubi9-python-3.9/nginx/root/opt/app-root/nginxconf.sed
diff --git a/codeserver/c9s-python-3.9/nginx/root/usr/share/container-scripts/nginx/common.sh b/codeserver/ubi9-python-3.9/nginx/root/usr/share/container-scripts/nginx/common.sh
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/root/usr/share/container-scripts/nginx/common.sh
rename to codeserver/ubi9-python-3.9/nginx/root/usr/share/container-scripts/nginx/common.sh
diff --git a/codeserver/c9s-python-3.9/nginx/serverconf/proxy.conf.template b/codeserver/ubi9-python-3.9/nginx/serverconf/proxy.conf.template
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/serverconf/proxy.conf.template
rename to codeserver/ubi9-python-3.9/nginx/serverconf/proxy.conf.template
diff --git a/codeserver/c9s-python-3.9/nginx/serverconf/proxy.conf.template_nbprefix b/codeserver/ubi9-python-3.9/nginx/serverconf/proxy.conf.template_nbprefix
similarity index 100%
rename from codeserver/c9s-python-3.9/nginx/serverconf/proxy.conf.template_nbprefix
rename to codeserver/ubi9-python-3.9/nginx/serverconf/proxy.conf.template_nbprefix
diff --git a/codeserver/c9s-python-3.9/run-code-server.sh b/codeserver/ubi9-python-3.9/run-code-server.sh
similarity index 100%
rename from codeserver/c9s-python-3.9/run-code-server.sh
rename to codeserver/ubi9-python-3.9/run-code-server.sh
diff --git a/codeserver/c9s-python-3.9/run-nginx.sh b/codeserver/ubi9-python-3.9/run-nginx.sh
similarity index 100%
rename from codeserver/c9s-python-3.9/run-nginx.sh
rename to codeserver/ubi9-python-3.9/run-nginx.sh
diff --git a/codeserver/c9s-python-3.9/utils/process.sh b/codeserver/ubi9-python-3.9/utils/process.sh
similarity index 100%
rename from codeserver/c9s-python-3.9/utils/process.sh
rename to codeserver/ubi9-python-3.9/utils/process.sh