diff --git a/manifests/site/gcp-test-site/phases/delete_iso_plan_patch.yaml b/manifests/site/gcp-test-site/phases/delete_iso_plan_patch.yaml
new file mode 100644
index 000000000..732d45c53
--- /dev/null
+++ b/manifests/site/gcp-test-site/phases/delete_iso_plan_patch.yaml
@@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: airshipit.org/v1alpha1
+kind: PhasePlan
+metadata:
+  name: iso
\ No newline at end of file
diff --git a/manifests/site/gcp-test-site/phases/kustomization.yaml b/manifests/site/gcp-test-site/phases/kustomization.yaml
index ba1515561..be428d179 100644
--- a/manifests/site/gcp-test-site/phases/kustomization.yaml
+++ b/manifests/site/gcp-test-site/phases/kustomization.yaml
@@ -1,7 +1,9 @@
 resources:
   - ../../../phases
   - ../../../function/airshipctl-base-catalogues
-  - plan.yaml
+patchesStrategicMerge:
+  - plan_patch.yaml
+  - delete_iso_plan_patch.yaml
 patchesJson6902:
   - target:
       group: airshipit.org
diff --git a/manifests/site/gcp-test-site/phases/plan.yaml b/manifests/site/gcp-test-site/phases/plan_patch.yaml
similarity index 54%
rename from manifests/site/gcp-test-site/phases/plan.yaml
rename to manifests/site/gcp-test-site/phases/plan_patch.yaml
index 77e7c2440..3f86bc446 100644
--- a/manifests/site/gcp-test-site/phases/plan.yaml
+++ b/manifests/site/gcp-test-site/phases/plan_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: airshipit.org/v1alpha1
 kind: PhasePlan
 metadata:
-  name: phasePlan
+  name: deploy-gating
 phases:
   - name: clusterctl-init-ephemeral
   - name: controlplane-ephemeral
@@ -9,3 +9,10 @@ phases:
   - name: clusterctl-init-target
   - name: clusterctl-move
   - name: workers-target
+validation:
+  kindsToSkip:
+    - Clusterctl
+    - VariableCatalogue
+  crdList:
+    - airshipctl/manifests/function/airshipctl-schemas
+    - airshipctl/manifests/function/cert-manager/v1.1.0/upstream
\ No newline at end of file
diff --git a/tools/validate_docs b/tools/validate_docs
index 5669c0d38..3c58c864c 100755
--- a/tools/validate_docs
+++ b/tools/validate_docs
@@ -66,7 +66,7 @@ for site_root in ${SITE_ROOTS}; do
   for site in $(ls ${MANIFEST_ROOT}/${site_root}); do
     # TODO (raliev) remove this condition later
     # Temporary solution to disable validation for outdated sites, this list will be removed eventually
-    sites_to_skip=(az-test-site docker-test-site gcp-test-site openstack-test-site)
+    sites_to_skip=(az-test-site docker-test-site openstack-test-site)
     if [[ " ${sites_to_skip[@]} " =~ " ${site} " ]]; then
       continue
     fi