diff --git a/.github/workflows/apiserver-test.yaml b/.github/workflows/apiserver-test.yaml
index 7af16943e..d475d4cc6 100644
--- a/.github/workflows/apiserver-test.yaml
+++ b/.github/workflows/apiserver-test.yaml
@@ -84,9 +84,8 @@ jobs:
       - name: Cleanup for e2e tests
         run: |
           make e2e-cleanup
-          make e2e-setup-core
-
           make vela-cli
+          make e2e-setup-core
           bin/vela addon enable fluxcd
           timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
           kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
diff --git a/.github/workflows/e2e-multicluster-test.yml b/.github/workflows/e2e-multicluster-test.yml
index 8ce59c7f8..a6a4ff0f4 100644
--- a/.github/workflows/e2e-multicluster-test.yml
+++ b/.github/workflows/e2e-multicluster-test.yml
@@ -79,10 +79,10 @@ jobs:
       - name: Cleanup for e2e tests
         run: |
           make e2e-cleanup
+          make vela-cli
           make e2e-setup-core
           make
           make setup-runtime-e2e-cluster
-          make vela-cli
 
       - name: Run e2e multicluster tests
         run: |
diff --git a/makefiles/e2e.mk b/makefiles/e2e.mk
index 7b5984a1b..ff58b0616 100644
--- a/makefiles/e2e.mk
+++ b/makefiles/e2e.mk
@@ -4,7 +4,10 @@ e2e-setup-core:
 	sh ./hack/e2e/modify_charts.sh
 	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
 	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
+	helm upgrade --install --namespace vela-system --wait oam-rollout --set image.repository=vela-runtime-rollout-test --set image.tag=$(GIT_COMMIT) ./runtime/rollout/charts
 	go run ./e2e/addon/mock &
+	sleep 5
+	bin/vela addon enable rollout
 
 .PHONY: setup-runtime-e2e-cluster
 setup-runtime-e2e-cluster:
@@ -19,6 +22,7 @@ e2e-setup:
 	helm upgrade --install --namespace vela-system --wait oam-rollout --set image.repository=vela-runtime-rollout-test --set image.tag=$(GIT_COMMIT) ./runtime/rollout/charts
 
 	go run ./e2e/addon/mock &
+	sleep 5
 	bin/vela addon enable fluxcd
 	bin/vela addon enable terraform
 	bin/vela addon enable terraform-alibaba ALICLOUD_ACCESS_KEY=xxx ALICLOUD_SECRET_KEY=yyy ALICLOUD_REGION=cn-beijing