diff --git a/.gitignore b/.gitignore
index 2c92b13aab..ac446a2a01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 src/
 snapshot/
 build*
+latest_openshift.repo
diff --git a/Makefile b/Makefile
index fc2836e5e9..83753ded39 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,7 @@ syntax-check:
 .PHONY: container
 container:
 	imagebuild -privileged .
+
+.PHONY: refresh
+refresh:
+	./generate-openshift-repo
diff --git a/generate-openshift-repo b/generate-openshift-repo
new file mode 100755
index 0000000000..1ec7e39822
--- /dev/null
+++ b/generate-openshift-repo
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -xeuo pipefail
+
+LATEST_OPENSHIFT_REPO=`curl https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms`
+
+echo "[openshift]
+name=openshift
+baseurl=${LATEST_OPENSHIFT_REPO}
+type=rpm
+enabled=1
+gpgcheck=0" > latest_openshift.repo
diff --git a/host-base.json b/host-base.json
index 1b9c143fad..8780b5dc46 100644
--- a/host-base.json
+++ b/host-base.json
@@ -5,6 +5,7 @@
     "repos": [
         "atomic-centos-continuous",
         "origin-repo",
+        "openshift",
         "dustymabe-ignition"
     ],
     "selinux": true,
diff --git a/overlay.yml b/overlay.yml
index e7907f3dba..aa0e215291 100644
--- a/overlay.yml
+++ b/overlay.yml
@@ -25,8 +25,3 @@ components:
 
 #   - src: github:coreos/ignition
 #   TODO: use copr for distgit here OR get spec in the ignition repo
-
-    # Use the internal spec specified in origin repo
-    # so we don't pull content from dist-git
-  - src: github:openshift/origin
-    spec: internal