diff --git a/assets/templates/99_registry.yaml b/assets/templates/99_registry.yaml
index 63a77dc90..bb7783f12 100644
--- a/assets/templates/99_registry.yaml
+++ b/assets/templates/99_registry.yaml
@@ -15,6 +15,4 @@ spec:
     write:
       maxWaitInQueue: 0s
   storage:
-    filesystem:
-      volumeSource:
-        emptyDir: {}
+    emptyDir: {}
diff --git a/ocp_install_env.sh b/ocp_install_env.sh
index 7116b3f74..9056fc63e 100644
--- a/ocp_install_env.sh
+++ b/ocp_install_env.sh
@@ -13,7 +13,7 @@ export EXTERNAL_SUBNET="192.168.111.0/24"
 # The release we default to here is pinned and known to work with our current
 # version of kni-installer.
 #
-export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="registry.svc.ci.openshift.org/ocp/release:4.0.0-0.ci-2019-04-17-133604"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="registry.svc.ci.openshift.org/kni/release:4.1.0-rc.3-kni.0"
 
 function generate_ocp_install_config() {
     local outdir
diff --git a/utils.sh b/utils.sh
index 0799db14a..9de2d92ca 100644
--- a/utils.sh
+++ b/utils.sh
@@ -211,7 +211,7 @@ function patch_ep_host_etcd() {
     declare -r domain="$1"
     declare -r srv_record="_etcd-server-ssl._tcp.$domain"
     declare -r api_domain="api.$domain"
-    host_etcd_ep=$(oc get ep -n kube-system host-etcd -o json | jq -r '{"subsets": .subsets}')
+    host_etcd_ep=$(oc get ep -n openshift-etcd host-etcd -o json | jq -r '{"subsets": .subsets}')
     echo -n "Looking for etcd records"
     while ! host -t SRV "$srv_record" "$api_domain" >/dev/null 2>&1; do
         echo -n "."
@@ -245,7 +245,7 @@ patch['subsets'][0]['addresses'] = addresses
 print(yaml.safe_dump(patch))
 EOF
     )" "$host_etcd_ep" "${etcd_hosts[@]}")
-    oc -n kube-system patch ep/host-etcd --patch "$patch"
+    oc -n openshift-etcd patch ep/host-etcd --patch "$patch"
 }
 
 function sync_repo_and_patch {