diff --git a/demo/lib/distro.bash b/demo/lib/distro.bash
index 14d0cd72f..0fcfdcb3d 100644
--- a/demo/lib/distro.bash
+++ b/demo/lib/distro.bash
@@ -25,6 +25,7 @@ distro-refresh-pkg-db()     { distro-resolve "$@"; }
 distro-install-pkg()        { distro-resolve "$@"; }
 distro-remove-pkg()         { distro-resolve "$@"; }
 distro-setup-proxies()      { distro-resolve "$@"; }
+distro-setup-oneshot()      { distro-resolve "$@"; }
 distro-install-utils()      { distro-resolve "$@"; }
 distro-install-golang()     { distro-resolve "$@"; }
 distro-install-runc()       { distro-resolve "$@"; }
@@ -531,6 +532,12 @@ opensuse-pkg-type() {
     echo "rpm"
 }
 
+opensuse-setup-oneshot() {
+    # Remove bad version of containerd if it is already installed,
+    # otherwise valid version of the package will not be installed.
+    vm-command "rpm -q containerd && ( zypper info containerd | awk '/Repository/{print $3}' | grep -v Virtualization ) && echo Removing wrong containerd version && zypper --non-interactive rm containerd"
+}
+
 opensuse-install-repo() {
     opensuse-wait-for-zypper
     vm-command "$ZYPPER addrepo $* && $ZYPPER refresh" ||
@@ -691,11 +698,9 @@ EOF
         command-error "failed to enable kubelet"
 }
 
-opensuse-bootstrap-commands() {
+opensuse-bootstrap-commands-pre() {
     cat <<EOF
-export HTTP_PROXY="$http_proxy"
-export HTTPS_PROXY="$http_proxy"
-zypper refresh && zypper install ssh && systemctl enable ssh && systemctl start ssh
+sed -e '/Signature checking/a gpgcheck = off' -i /etc/zypp/zypp.conf
 EOF
 }
 
@@ -803,6 +808,10 @@ EOF
     done
 }
 
+default-setup-oneshot() {
+    :
+}
+
 default-install-utils() {
     # $distro-install-utils() is responsible for installing common
     # utilities, such as pidof and killall, that the test framework
diff --git a/demo/lib/vm.bash b/demo/lib/vm.bash
index e360fb58c..688eefdeb 100644
--- a/demo/lib/vm.bash
+++ b/demo/lib/vm.bash
@@ -634,6 +634,7 @@ vm-install-pkg() {
 vm-setup-oneshot() {
     local util
     ( distro-refresh-pkg-db ) || true
+    distro-setup-oneshot
     distro-install-utils
     # Verify that all required utilities exit on the VM.
     for util in pidof killall; do