diff --git a/origin.spec b/origin.spec
index da6d1e2..fc756b1 100644
--- a/origin.spec
+++ b/origin.spec
@@ -103,6 +103,8 @@ BuildRequires:  krb5-devel
 BuildRequires:  rsync
 Requires:       %{name}-clients = %{version}-%{release}
 Requires:       iptables
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
 Obsoletes:      openshift < %{package_refector_version}
 
 #
@@ -2105,6 +2107,8 @@ Obsoletes:        openshift-sdn-ovs < %{package_refector_version}
 %package federation-services
 Summary:        %{produce_name} Federation Services
 Requires:       %{name} = %{version}-%{release}
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
 
 %description federation-services
 
@@ -2260,7 +2264,8 @@ install -p -m 755 _output/local/bin/windows/amd64/oadm.exe %{buildroot}/%{_datad
 %endif
 
 # Install federation services
-install -p -m 755 _output/local/bin/${PLATFORM}/hyperkube %{buildroot}%{_bindir}/
+touch %{buildroot}%{_bindir}/hyperkube
+install -p -m 755 _output/local/bin/${PLATFORM}/hyperkube %{buildroot}%{_bindir}/hyperkube.origin
 
 # Install cluster capacity
 install -p -m 755 cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/_output/local/bin/${PLATFORM}/hypercc %{buildroot}%{_bindir}/
@@ -2291,8 +2296,6 @@ do
     ln -s openshift %{buildroot}%{_bindir}/$cmd
 done
 
-ln -s oc %{buildroot}%{_bindir}/kubectl
-
 install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
 
 # different service for origin vs aos
@@ -2357,7 +2360,7 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
 %doc README.md
 %license LICENSE
 %{_bindir}/openshift
-%{_bindir}/hyperkube
+%{_bindir}/hyperkube.origin
 %{_bindir}/openshift-deploy
 %{_bindir}/openshift-f5-router
 %{_bindir}/openshift-recycle
@@ -2374,6 +2377,7 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
 %dir %config(noreplace) %{_sysconfdir}/origin
 %ghost %dir %config(noreplace) %{_sysconfdir}/origin
 %ghost %config(noreplace) %{_sysconfdir}/origin/.config_managed
+%ghost %{_bindir}/hyperkube
 %{_mandir}/man1/openshift*
 
 %pre
@@ -2396,6 +2400,15 @@ fi
 %{_libexecdir}/%{name}/extended.test
 %endif
 
+%post
+%{_sbindir}/update-alternatives --install %{_bindir}/hyperkube \
+  hyperkube %{_bindir}/hyperkube.origin 10
+
+%postun
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove hyperkube %{_bindir}/hyperkube.origin
+fi
+
 %files master
 %license LICENSE
 %{_unitdir}/%{name}-master.service
@@ -2500,7 +2513,6 @@ fi
 %files clients
 %license LICENSE
 %{_bindir}/oc
-%{_bindir}/kubectl
 %{_bindir}/oadm
 %{_sysconfdir}/bash_completion.d/oc
 %{_mandir}/man1/oc*
@@ -2582,12 +2594,23 @@ if [ "$1" -eq 0 ] ; then
 fi
 
 %files federation-services
-%{_bindir}/hyperkube
+%{_bindir}/hyperkube.origin
+%ghost %{_bindir}/hyperkube
+
+%post federation-services
+%{_sbindir}/update-alternatives --install %{_bindir}/hyperkube \
+  hyperkube %{_bindir}/hyperkube.origin 10
+
+%postun federation-services
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove hyperkube %{_bindir}/hyperkube.origin
+fi
 
 %changelog
 * Fri Jun 29 2018 Jakub Čajka <jcajka@fedoraproject.org> - 3.9.0-3
 - incorporate changes from the upstream spec file
-- move to hypercube
+- move to hyperkube
+- add alternatives for hyperkube
 
 * Wed May 30 2018 Jakub Čajka <jcajka@fedoraproject.org> - 3.9.0-2
 - Add web-console sub-package