diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ff14446e..b0d6b718 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -135,6 +135,7 @@ jobs:
 
       - name: Install Azure cli
         run: |
+          sudo zypper clean --all
           sudo zypper install -y azure-cli
           pip install azure-cli
             
@@ -172,7 +173,7 @@ jobs:
           make e2e-provisioning-tests
 
       - name: Importing cluster tests
-        if: ${{ inputs.run_p0_importing_tests == true }}
+        if: ${{ !cancelled() && inputs.run_p0_importing_tests == true }}
         env:
           RANCHER_HOSTNAME: ${{ steps.runner-ip.outputs.PUBLIC_IP}}.sslip.io
           CATTLE_TEST_CONFIG: ${{ github.workspace }}/cattle-config-import.yaml
@@ -180,7 +181,7 @@ jobs:
           make e2e-import-tests
 
       - name: Support matrix provisioning tests
-        if: ${{ inputs.run_support_matrix_provisioning_tests == true }}
+        if: ${{ !cancelled() && inputs.run_support_matrix_provisioning_tests == true }}
         env:
           RANCHER_HOSTNAME: ${{ steps.runner-ip.outputs.PUBLIC_IP}}.sslip.io
           CATTLE_TEST_CONFIG: ${{ github.workspace }}/cattle-config-provisioning.yaml
@@ -188,7 +189,7 @@ jobs:
           make e2e-support-matrix-provisioning-tests
 
       - name: Support matrix importing tests
-        if: ${{ inputs.run_support_matrix_importing_tests == true }}
+        if: ${{ !cancelled() && inputs.run_support_matrix_importing_tests == true }}
         env:
           RANCHER_HOSTNAME: ${{ steps.runner-ip.outputs.PUBLIC_IP}}.sslip.io
           CATTLE_TEST_CONFIG: ${{ github.workspace }}/cattle-config-import.yaml
diff --git a/Makefile b/Makefile
index e94407be..67d80881 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install-cert-manager: ## Install cert-manager via Helm on the k8s cluster
 install-rancher: ## Install Rancher via Helm on the k8s cluster
 	helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
 	helm repo update
-	helm install rancher --devel rancher-latest/rancher --version ${RANCHER_VERSION} \
+	helm install rancher --devel rancher-latest/rancher \
 		--namespace cattle-system \
 		--create-namespace \
 		--set global.cattle.psp.enabled=false \
@@ -42,7 +42,7 @@ install-rancher: ## Install Rancher via Helm on the k8s cluster
 install-rancher-hosted-nightly-chart: ## Install Rancher via Helm with hosted providers nightly chart
 	helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
 	helm repo update
-	helm install rancher --devel rancher-latest/rancher --version ${RANCHER_VERSION} \
+	helm install rancher --devel rancher-latest/rancher \
 		--namespace cattle-system \
 		--create-namespace \
 		--set global.cattle.psp.enabled=false \
diff --git a/hosted/helpers/helper_common.go b/hosted/helpers/helper_common.go
index 53b60e6b..83e86fba 100644
--- a/hosted/helpers/helper_common.go
+++ b/hosted/helpers/helper_common.go
@@ -2,15 +2,16 @@ package helpers
 
 import (
 	"fmt"
-	"github.com/onsi/ginkgo/v2"
-	"github.com/rancher/shepherd/extensions/clusters/aks"
-	"github.com/rancher/shepherd/extensions/clusters/eks"
-	"github.com/rancher/shepherd/extensions/clusters/gke"
 	"os"
 	"os/user"
 	"strings"
 	"time"
 
+	"github.com/onsi/ginkgo/v2"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
+	"github.com/rancher/shepherd/extensions/clusters/eks"
+	"github.com/rancher/shepherd/extensions/clusters/gke"
+
 	. "github.com/onsi/gomega"
 	"github.com/rancher/shepherd/clients/rancher"
 	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"