diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 897664a5..032ccc7f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ env:
   GO_VERSION: '1.23'
   GOLANGCI_VERSION: 'v1.56'
   KIND_VERSION: 'v0.29.0'
+  K8S_VERSION: 'v1.31.9'
 
 jobs:
 
@@ -99,8 +100,8 @@ jobs:
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.2.0
         with:
-          version: v0.29.0
-          node_image: kindest/node:v1.31.9
+          version: ${{ env.KIND_VERSION }}
+          node_image: kindest/node:${{ env.K8S_VERSION }}
       - name: Build Image
         run: |
           make image
@@ -144,8 +145,8 @@ jobs:
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.2.0
         with:
-          version: v0.29.0
-          node_image: kindest/node:v1.31.9
+          version: ${{ env.KIND_VERSION }}
+          node_image: kindest/node:${{ env.K8S_VERSION }}
       - name: Prepare OCM testing environment
         run: |
           clusteradm init --output-join-command-file join.sh --wait
@@ -159,12 +160,15 @@ jobs:
           kind load docker-image oamdev/cluster-gateway-addon-manager:latest  --name chart-testing
       - name: Install latest cluster-gateway
         run: |
+          set -ex
           helm install --create-namespace -n open-cluster-management-addon \
             cluster-gateway ./charts/addon-manager \
             --set tag=latest
           go run ./e2e/env/prepare | kubectl apply -f -
           kubectl rollout status deployment -n vela-system gateway-deployment --timeout 1m
-          kubectl wait --for=condition=Available apiservice/v1alpha1.cluster.core.oam.dev
+          kubectl wait --for=condition=Available apiservice/v1alpha1.cluster.core.oam.dev --timeout=300s
       - name: Run e2e test
         run: |
+          sleep 360
+          kubectl get clustergateways -A
           make test-e2e-ocm
diff --git a/.gitignore b/.gitignore
index 4b48354d..f1f0d4cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,10 @@ bin
 # Kubernetes Generated files - skip generated files, except for vendored files
 
 !vendor/**/zz_generated.*
+join.sh
 
 # editor and IDE paraphernalia
+.vscode/
 .idea
 *.swp
 *.swo
diff --git a/charts/addon-manager/values.yaml b/charts/addon-manager/values.yaml
index 1f0ec3eb..ef508978 100644
--- a/charts/addon-manager/values.yaml
+++ b/charts/addon-manager/values.yaml
@@ -1,4 +1,4 @@
-# Image of the cluster-gateway instances
+# Specs of cluster-gateway-addon-manager deployment
 image: oamdev/cluster-gateway-addon-manager
 
 tag:
diff --git a/charts/cluster-gateway/values.yaml b/charts/cluster-gateway/values.yaml
index 4d1b13d1..e9b11624 100644
--- a/charts/cluster-gateway/values.yaml
+++ b/charts/cluster-gateway/values.yaml
@@ -1,4 +1,4 @@
-# Image of the cluster-gateway instances
+# Specs of gateway-deployment deployment
 image: oamdev/cluster-gateway
 
 tag:
diff --git a/e2e/ocm/clustergateway.go b/e2e/ocm/clustergateway.go
index 5e43e1ba..0b83ed25 100644
--- a/e2e/ocm/clustergateway.go
+++ b/e2e/ocm/clustergateway.go
@@ -20,7 +20,7 @@ const (
 	ocmTestBasename = "ocm-addon"
 )
 
-var _ = Describe("Addon Manager Test", func() {
+var _ = Describe("Addon Manager Test", Ordered, func() {
 	f := framework.NewE2EFramework(ocmTestBasename)
 	It("ClusterGateway addon installation should work",
 		func() {
@@ -53,8 +53,7 @@ var _ = Describe("Addon Manager Test", func() {
 					}
 					gwHealthy := gw.Status.Healthy
 					return addonHealthy && gwHealthy, nil
-				}).
-				WithTimeout(time.Minute).
+				}, 3*time.Minute, 20*time.Second).
 				Should(BeTrue())
 		})
 	It("Manual probe healthiness should work",