diff --git a/manifests/function/phase-helpers/get_pods/kubectl_get_pods.sh b/manifests/function/phase-helpers/get_pods/kubectl_get_pods.sh
index 1ae64369a..74e10943d 100644
--- a/manifests/function/phase-helpers/get_pods/kubectl_get_pods.sh
+++ b/manifests/function/phase-helpers/get_pods/kubectl_get_pods.sh
@@ -14,4 +14,5 @@
 
 set -xe
 
+kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT --request-timeout 10s get crd --all-namespaces 1>&2
 kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT --request-timeout 10s get pods --all-namespaces 1>&2
diff --git a/manifests/function/phase-helpers/wait_deploy/kubectl_wait_deploy.sh b/manifests/function/phase-helpers/wait_deploy/kubectl_wait_deploy.sh
index 6f34f37f4..87038fde6 100644
--- a/manifests/function/phase-helpers/wait_deploy/kubectl_wait_deploy.sh
+++ b/manifests/function/phase-helpers/wait_deploy/kubectl_wait_deploy.sh
@@ -14,4 +14,5 @@
 
 set -xe
 
-kubectl --kubeconfig $KUBECONFIG  --context $KCTL_CONTEXT wait --for=condition=available deploy --all --timeout=1000s -A 1>&2
+kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT wait --for=condition=Established crd --all --timeout=300s -A 1>&2
+kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT wait --for=condition=available deploy --all --timeout=1000s -A 1>&2
diff --git a/manifests/site/docker-test-site/phases/plan_patch.yaml b/manifests/site/docker-test-site/phases/plan_patch.yaml
index a1781a42d..349dadbc8 100644
--- a/manifests/site/docker-test-site/phases/plan_patch.yaml
+++ b/manifests/site/docker-test-site/phases/plan_patch.yaml
@@ -17,3 +17,16 @@ phases:
   - name: kubectl-wait-pods-any-ephemeral
   - name: clusterctl-move
   - name: workers-target
+validation:
+  kindsToSkip:
+    - Clusterctl
+    - VariableCatalogue
+  crdList:
+    - airshipctl/manifests/function/airshipctl-schemas
+    - airshipctl/manifests/function/cert-manager/v1.1.0
+---
+apiVersion: airshipit.org/v1alpha1
+kind: PhasePlan
+metadata:
+  name: iso
+$patch: delete
diff --git a/manifests/site/gcp-test-site/phases/kustomization.yaml b/manifests/site/gcp-test-site/phases/kustomization.yaml
index be428d179..beba9ae2b 100644
--- a/manifests/site/gcp-test-site/phases/kustomization.yaml
+++ b/manifests/site/gcp-test-site/phases/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../phases
+  - ../../../type/gating/phases
   - ../../../function/airshipctl-base-catalogues
 patchesStrategicMerge:
   - plan_patch.yaml
diff --git a/tools/validate_docs b/tools/validate_docs
index d946904c2..49c1801d8 100755
--- a/tools/validate_docs
+++ b/tools/validate_docs
@@ -25,11 +25,10 @@ set -o pipefail
 : ${MANIFEST_PATH:="manifests/site"}
 : ${SITE_ROOTS:="$(basename "${PWD}")/${MANIFEST_PATH}"}
 : ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/airshipctl"}
-: ${SITES_TO_SKIP:="az-test-site docker-test-site openstack-test-site"}
-
+: ${SITES_TO_SKIP:="az-test-site gcp-test-site openstack-test-site"}
 
 # Name of specific site to be validated
-SITE=${SITE:-$1}
+SITE=$1
 TMP=$(mktemp -d)
 
 # TODO: use `airshipctl config` to do this once all the needed knobs are exposed
@@ -66,15 +65,8 @@ EOL
 
 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=(${SITES_TO_SKIP})
-    if [[ " ${sites_to_skip[@]} " =~ " ${site} " ]]; then
-      continue
-    fi
-
-    # Validate only specific site if set
-    if [ ! -z "$SITE" ] && [ "$site" != "$SITE" ]; then
+    if [[ -z "$SITE" && " ${sites_to_skip[@]} " =~ " ${site} " ]] || [[ ! -z "$SITE" && "$site" != $SITE ]]; then
       continue
     fi
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 71f62c449..3b8864c9c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -101,7 +101,7 @@
 - job:
     name: airship-airshipctl-gate-script-runner
     attempts: 1
-    timeout: 8400
+    timeout: 9000
     pre-run:
       - playbooks/airship-airshipctl-deploy-docker.yaml
       - playbooks/airship-airshipctl-build-gate.yaml
@@ -215,7 +215,7 @@
         - CLUSTER=ephemeral-cluster KIND_CONFIG=./tools/deployment/templates/kind-cluster-with-extramounts ./tools/deployment/kind/start_kind.sh
         - ./tools/deployment/23_pull_documents.sh
         - ./tools/deployment/25_deploy_gating.sh
-    voting: true
+    voting: false
 - job:
     name: airship-airshipctl-docker-kubebench-conformance
     attempts: 1