diff --git a/openshift-serverless-clients.spec b/openshift-serverless-clients.spec
index 8a49aa2cf0..361bd6f124 100644
--- a/openshift-serverless-clients.spec
+++ b/openshift-serverless-clients.spec
@@ -3,7 +3,7 @@
 %global package_name openshift-serverless-clients
 %global product_name OpenShift Serverless
 %global golang_version 1.14
-%global kn_version 0.17.2
+%global kn_version 0.18.4
 %global kn_release 1
 %global kn_cli_version v%{kn_version}
 %global source_dir knative-client
@@ -64,6 +64,9 @@ Obsoletes:      %{package_name} < %{kn_version}
 %{_datadir}/%{name}-redistributable/windows/kn-windows-amd64.exe
 
 %changelog
+* Wed Dec 09 2020 Navid Shaikh <nshaikh@redhat.com> v0.18.4-1
+- Bump kn release v0.18.4
+
 * Mon Oct 12 2020 Navid Shaikh <nshaikh@redhat.com> v0.17.2-1
 - Bump kn release v0.17.2
 
diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
index 57f06df931..b1e8720d35 100644
--- a/openshift/ci-operator/build-image/Dockerfile
+++ b/openshift/ci-operator/build-image/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Dockerfile to bootstrap build and test in openshift-ci
-FROM openshift/origin-release:golang-1.14
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14
 
 # Add kubernetes repository
 ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/