diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 0586ba1d66..9dc28f8de9 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -118,7 +118,7 @@ steps:
       inlineScript: |
         echo "Deleting cluster"
         make -C ./hack/swift azcfg AZCLI=az
-        make -C ./hack/swift down SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision)
+        make -C ./hack/swift down SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }}-$(make revision)
         echo "Cluster and resources down"
     name: "Cleanupcluster"
     displayName: "Cleanup cluster"
diff --git a/.pipelines/submodules-pipeline.yaml b/.pipelines/submodules-pipeline.yaml
index d3f3d506e9..43641048a3 100644
--- a/.pipelines/submodules-pipeline.yaml
+++ b/.pipelines/submodules-pipeline.yaml
@@ -253,6 +253,7 @@ stages:
       pipelineBuildImage: "$(BUILD_IMAGE)"
       testDropgz: true
       clusterName: "submodules-swifte2e"
+      osSku: "Ubuntu"
 
   - stage: cleanup
     displayName: Cleanup