diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6490a0b..9e3c765 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Do not use methods from Kitchen::SSHBase as we are no longer inherit them. Rely on instance.transport instead.
+
 ## 0.2.0
 
 * Switch SSH api to use gateway-enabled wrapper, instead of raw Kitchen::SSH, which does not support ssh gateways.
diff --git a/lib/kitchen/driver/opennebula.rb b/lib/kitchen/driver/opennebula.rb
index 5b296a1..26bca70 100644
--- a/lib/kitchen/driver/opennebula.rb
+++ b/lib/kitchen/driver/opennebula.rb
@@ -127,7 +127,7 @@ def create(state)
       end
 
       def tcp_check(state)
-        wait_for_sshd(state[:hostname]) unless config[:no_ssh_tcp_check]
+        instance.transport.connection(state).wait_until_ready unless config[:no_ssh_tcp_check]
         sleep(config[:no_ssh_tcp_check_sleep]) if config[:no_ssh_tcp_check]
         debug("SSH ready on #{instance.to_str}")
       end
@@ -145,7 +145,9 @@ def wait_for_passwordless_sudo(state)
         retries = config[:passwordless_sudo_timeout] || 300
         retry_interval = config[:passwordless_sudo_retry_interval] || 10
         begin
-          remote_command(state, 'sudo -n true')
+          instance.transport.connection(state) do |conn|
+            conn.execute('sudo -n true')
+          end
         rescue Kitchen::Transport::SshFailed => e
           if (e.message.eql? "SSH exited (1) for command: [sudo -n true]") && (retries >= 0)
             sleep retry_interval
diff --git a/lib/kitchen/driver/opennebula_version.rb b/lib/kitchen/driver/opennebula_version.rb
index 1bc6e5b..dd802be 100644
--- a/lib/kitchen/driver/opennebula_version.rb
+++ b/lib/kitchen/driver/opennebula_version.rb
@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Opennebula Kitchen driver
-    OPENNEBULA_VERSION = "0.2.0"
+    OPENNEBULA_VERSION = "0.2.1"
   end
 end