diff --git a/generate-openshift-repo b/generate-openshift-repo
index 91581980..5a067207 100755
--- a/generate-openshift-repo
+++ b/generate-openshift-repo
@@ -3,6 +3,7 @@
 set -xeuo pipefail
 
 LATEST_OPENSHIFT_REPO=`curl https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms`
+LATEST_ATOMIC_OPENSHIFT_REPO='http://download-node-02.eng.bos.redhat.com/rcm-guest/puddles/RHAOS/AtomicOpenShift/4.0/latest/puddle.repo'
 
 echo "[openshift]
 name=openshift
@@ -10,3 +11,6 @@ baseurl=${LATEST_OPENSHIFT_REPO}
 type=rpm
 enabled=1
 gpgcheck=0" > openshift.repo
+
+curl -L -s "${LATEST_ATOMIC_OPENSHIFT_REPO}" | head -n 5 > atomic-openshift.repo
+sed -i "1s|.*|[atomic-openshift]|" atomic-openshift.repo
diff --git a/host-base.yaml b/host-base.yaml
index ccd2de53..e4e7e76c 100644
--- a/host-base.yaml
+++ b/host-base.yaml
@@ -167,7 +167,7 @@ packages:
  # Editors
  - vim-minimal nano
  # OpenShift
- - origin-node origin-hyperkube origin-clients
+ - atomic-openshift-node atomic-openshift-hyperkube atomic-openshift-clients
  # pivot/ota tools
  - pivot
  # Red Hat CA certs
diff --git a/host-maipo.yaml b/host-maipo.yaml
index 7adffc8c..55b0af20 100644
--- a/host-maipo.yaml
+++ b/host-maipo.yaml
@@ -12,8 +12,8 @@ repos:
   - rhcos-continuous
   # We currently track ostree/rpm-ostree git master upstream
   - atomic-centos-continuous
-  # Generated via Origin PR jobs
-  - openshift
+  # Generated by ART team
+  - atomic-openshift
   # Maintained by containers runtime team
   - cri-o-tested
   # COPRs
@@ -38,8 +38,6 @@ packages:
  - container-storage-setup cloud-utils-growpart
  # Remote storage (maipo only)
  - ceph-common glusterfs-fuse
- # OpenShift
- - origin-node origin-hyperkube origin-clients
 
 remove-from-packages:
   # https://github.com/openshift/os/issues/275