diff --git a/.gitignore b/.gitignore
index 5dd1faa8..81ed3f9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ override.tf.json
 *_override.tf
 *_override.tf.json
 
+**/.DS_Store
+**/*.tfplan
+
 *.qcow2
 *.raw
 
diff --git a/k8s/infra/controllers/cert-manager/values.yaml b/k8s/infra/controllers/cert-manager/values.yaml
index 87835a47..d916cbe8 100644
--- a/k8s/infra/controllers/cert-manager/values.yaml
+++ b/k8s/infra/controllers/cert-manager/values.yaml
@@ -1,5 +1,7 @@
-installCRDs: true
-
+#installCRDs: true
+crds:
+  enabled: true
+  keep: true
 extraArgs:
   - "--enable-gateway-api"
 
diff --git a/tofu/kubernetes/talos/machine-config/control-plane.yaml.tftpl b/tofu/kubernetes/talos/machine-config/control-plane.yaml.tftpl
index 12871e3b..539529e9 100644
--- a/tofu/kubernetes/talos/machine-config/control-plane.yaml.tftpl
+++ b/tofu/kubernetes/talos/machine-config/control-plane.yaml.tftpl
@@ -12,6 +12,14 @@ cluster:
       name: none
   proxy:
     disabled: true
+  #need to install gateway api manifests before cilium deployment. GatewayClass acceptance 
+  extraManifests:
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml
+    - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml
   inlineManifests:
   - name: cilium-values
     contents: |