diff --git a/.github/workflows/cleanup-all.yml b/.github/workflows/cleanup-all.yml
index 642a9949ef..a3783853ed 100644
--- a/.github/workflows/cleanup-all.yml
+++ b/.github/workflows/cleanup-all.yml
@@ -45,7 +45,7 @@ jobs:
           go-version: '1.19'
 
       - name: Run cleanup VPC
-        if: always() && github.event.inputs.cleanVPC == 'true'
+        if: github.event_name == 'schedule' || github.event.inputs.cleanVPC == 'true'
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -55,7 +55,7 @@ jobs:
         run: (cd .github/actions/clean-vpc && go run .)
 
       - name: Run cleanup PE
-        if: always() && github.event.inputs.cleanPE == 'true'
+        if: github.event_name == 'schedule' || github.event.inputs.cleanPE == 'true'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
diff --git a/test/e2e/actions/serverlessprivateendpoint/spe.go b/test/e2e/actions/serverlessprivateendpoint/spe.go
index a72e39e6eb..b681d05a4f 100644
--- a/test/e2e/actions/serverlessprivateendpoint/spe.go
+++ b/test/e2e/actions/serverlessprivateendpoint/spe.go
@@ -51,8 +51,14 @@ func ConnectSPE(spe []v1.ServerlessPrivateEndpoint, peStatuses []status.Serverle
 			return err
 		}
 		for _, peStatus := range peStatuses {
-			peID, peIP, err := sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
+			var peID, peIP string
+			peID, peIP, err = sessionAzure.CreatePrivateEndpoint(config.AzureRegionEU, cloud.ResourceGroup, peStatus.EndpointServiceName, peStatus.PrivateLinkServiceResourceID)
 			if err != nil {
+				// try to delete endpoint
+				errDelete := sessionAzure.DeletePrivateEndpoint(cloud.ResourceGroup, peStatus.EndpointServiceName)
+				if errDelete != nil {
+					return errDelete
+				}
 				return err
 			}
 			for i, specPE := range spe {