diff --git a/openshift-3.10/images/openshift-enterprise-cli.yml b/openshift-3.10/images/openshift-enterprise-cli.yml
new file mode 100644
index 0000000000..71218955b8
--- /dev/null
+++ b/openshift-3.10/images/openshift-enterprise-cli.yml
@@ -0,0 +1,22 @@
+content:
+  source:
+    alias: ose
+    modifications:
+    - action: replace
+      match: origin-clients
+      replacement: openshift-enterprise-clients
+    path: images/cli
+enabled_repos:
+- rhel-server-ose-rpms
+from:
+  member: openshift-enterprise-base-docker
+labels:
+  License: GPLv2+
+  architecture: x86_64
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
+  io.k8s.display-name: OpenShift Client
+  io.openshift.tags: openshift,cli
+  vendor: Red Hat
+name: openshift3/ose-cli
+distgit:
+  namespace: containers
\ No newline at end of file
diff --git a/openshift-3.10/images/openshift-enterprise-hyperkube.yml b/openshift-3.10/images/openshift-enterprise-hyperkube.yml
new file mode 100644
index 0000000000..d32ec7449f
--- /dev/null
+++ b/openshift-3.10/images/openshift-enterprise-hyperkube.yml
@@ -0,0 +1,22 @@
+content:
+  source:
+    alias: ose
+    modifications:
+    - action: replace
+      match: origin-hyperkube
+      replacement: openshift-enterprise-hyperkube
+    path: images/hyperkube
+enabled_repos:
+- rhel-server-ose-rpms
+from:
+  member: openshift-enterprise-base-docker
+labels:
+  License: GPLv2+
+  architecture: x86_64
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
+  io.k8s.display-name: OpenShift Kubernetes Server Commands
+  io.openshift.tags: openshift,hyperkube
+  vendor: Red Hat
+name: openshift3/ose-hyperkube
+distgit:
+  namespace: containers
\ No newline at end of file
diff --git a/openshift-3.10/images/openshift-enterprise-hypershift.yml b/openshift-3.10/images/openshift-enterprise-hypershift.yml
new file mode 100644
index 0000000000..2c7567482a
--- /dev/null
+++ b/openshift-3.10/images/openshift-enterprise-hypershift.yml
@@ -0,0 +1,22 @@
+content:
+  source:
+    alias: ose
+    modifications:
+    - action: replace
+      match: origin-hypershift
+      replacement: openshift-enterprise-hypershift
+    path: images/hypershift
+enabled_repos:
+- rhel-server-ose-rpms
+from:
+  member: openshift-enterprise-base-docker
+labels:
+  License: GPLv2+
+  architecture: x86_64
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
+  io.k8s.display-name: OpenShift Server Commands
+  io.openshift.tags: openshift,hypershift
+  vendor: Red Hat
+name: openshift3/ose-hypershift
+distgit:
+  namespace: containers
\ No newline at end of file
diff --git a/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml b/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml
deleted file mode 100644
index a3cf109601..0000000000
--- a/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-content:
-  source:
-    alias: ose
-    path: images/builder/docker/sti-builder
-from:
-  member: openshift-enterprise-docker
-labels:
-  License: GPLv2+
-  architecture: x86_64
-  io.k8s.description: This is a component of OpenShift Container Platform and is responsible
-    for executing source-to-image (s2i) image builds.
-  io.k8s.display-name: OpenShift Container Platform S2I Builder
-  io.openshift.tags: openshift,sti,builder
-  vendor: Red Hat
-name: openshift3/ose-sti-builder
-owners: []
diff --git a/openshift-3.10/images/openshift-enterprise-tests.yml b/openshift-3.10/images/openshift-enterprise-tests.yml
new file mode 100644
index 0000000000..85f731b6e5
--- /dev/null
+++ b/openshift-3.10/images/openshift-enterprise-tests.yml
@@ -0,0 +1,22 @@
+content:
+  source:
+    alias: ose
+    modifications:
+    - action: replace
+      match: origin-tests
+      replacement: openshift-enterprise-tests
+    path: images/tests
+enabled_repos:
+- rhel-server-ose-rpms
+from:
+  member: openshift-enterprise-cli-container
+labels:
+  License: GPLv2+
+  architecture: x86_64
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
+  io.k8s.display-name: OpenShift End-to-End Tests
+  io.openshift.tags: openshift,tests,e2e
+  vendor: Red Hat
+name: openshift3/ose-tests
+distgit:
+  namespace: containers
\ No newline at end of file