diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
index 45ee49d99..e321fb152 100644
--- a/package/yast2-installation.spec
+++ b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.0.16
+Version:        4.0.17
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -80,8 +80,9 @@ Requires:       yast2-proxy
 # writing settings in the first installation stage.
 Requires: yast2-services-manager >= 3.2.1
 
-## storage-ng based version
-Requires: yast2-network >= 3.3.7
+## y2remote based version
+BuildRequires: yast2-network >= 4.0.13
+Requires: yast2-network >= 4.0.13
 
 # Augeas lenses
 Requires:       augeas-lenses
diff --git a/src/lib/installation/remote_finish_client.rb b/src/lib/installation/remote_finish_client.rb
index 243e139e5..8893bba1a 100644
--- a/src/lib/installation/remote_finish_client.rb
+++ b/src/lib/installation/remote_finish_client.rb
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 require "yast"
+require "y2remote/remote"
 
 module Installation
   # Step of base installation finish for remote administration (VNC)
@@ -25,7 +26,6 @@ class RemoteFinishClient
 
     def initialize
       Yast.import "Linuxrc"
-      Yast.import "Remote"
       textdomain "installation"
     end
 
@@ -76,8 +76,12 @@ def modes
 
     # Enables remote access
     def enable_remote
-      Yast::Remote.Enable
-      Yast::Remote.Write
+      remote.enable!
+      remote.write
+    end
+
+    def remote
+      @remote ||= Y2Remote::Remote.instance
     end
   end
 end
diff --git a/test/remote_finish_test.rb b/test/remote_finish_test.rb
index 601e1f65f..c897b99e3 100755
--- a/test/remote_finish_test.rb
+++ b/test/remote_finish_test.rb
@@ -8,9 +8,7 @@ module Yast
   import "Linuxrc"
 
   describe ::Installation::RemoteFinishClient do
-    before do
-      stub_const("Yast::Remote", double)
-    end
+    let(:remote) { Y2Remote::Remote.instance }
 
     subject { ::Installation::RemoteFinishClient.new }
 
@@ -56,8 +54,9 @@ module Yast
 
     describe "#enable_remote" do
       it "enables remote access" do
-        expect(Remote).to receive(:Enable)
-        expect(Remote).to receive(:Write)
+        expect(remote).to receive(:enable!)
+        expect(remote).to receive(:write)
+
         subject.enable_remote
       end
     end