diff --git a/infrastructure/agones-gke.tf b/infrastructure/agones-gke.tf
index 8d8c14e..16a7289 100644
--- a/infrastructure/agones-gke.tf
+++ b/infrastructure/agones-gke.tf
@@ -25,7 +25,7 @@ data "google_container_engine_versions" "regions" {
 module "agones_gke_standard_clusters" {
   for_each = var.game_gke_standard_clusters
 
-  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke/?ref=v1.34.0"
+  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke/?ref=v1.35.0"
 
   cluster = {
     name             = each.key
@@ -49,7 +49,7 @@ module "agones_gke_standard_clusters" {
 module "agones_gke_autopilot_clusters" {
   for_each = var.game_gke_autopilot_clusters
 
-  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke-autopilot/?ref=v1.34.0"
+  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke-autopilot/?ref=v1.35.0"
 
   cluster = {
     name     = each.key
diff --git a/infrastructure/files/agones/agones-install.yaml.tpl b/infrastructure/files/agones/agones-install.yaml.tpl
index 948e161..1cc467f 100644
--- a/infrastructure/files/agones/agones-install.yaml.tpl
+++ b/infrastructure/files/agones/agones-install.yaml.tpl
@@ -1,7 +1,7 @@
 helmCharts:
   - name: agones
     repo: https://agones.dev/chart/stable
-    version: 1.34.0
+    version: 1.35.0
     releaseName: agones
     namespace: agones-system
     valuesInline:
diff --git a/infrastructure/files/open-match/kustomization.yaml.tpl b/infrastructure/files/open-match/kustomization.yaml.tpl
index 39ff587..5f98f1c 100644
--- a/infrastructure/files/open-match/kustomization.yaml.tpl
+++ b/infrastructure/files/open-match/kustomization.yaml.tpl
@@ -17,7 +17,7 @@ helmCharts:
 - name: open-match
   namespace: open-match
   repo: https://open-match.dev/chart/stable
-  version: 1.6.0
+  version: 1.8.0
   releaseName: open-match
   valuesInline:
     prometheus:
@@ -48,9 +48,3 @@ helmCharts:
 resources:
   - open-match.yaml
   - agones-allocator-vs.yaml
-
-patches:
-    - path: psp/delete-core-psp.yaml
-    - path: psp/delete-redis-psp.yaml
-    - path: psp/delete-service-role.yaml
-    - path: psp/delete-service-binding.yaml
diff --git a/infrastructure/terraform.tfvars.sample b/infrastructure/terraform.tfvars.sample
index 8e6b0c8..1b39d06 100644
--- a/infrastructure/terraform.tfvars.sample
+++ b/infrastructure/terraform.tfvars.sample
@@ -19,9 +19,9 @@ project            = "PROJECT_ID"
 resource_env_label = "demo-global-game"
 
 # Cloud Deploy Configuration
-platform_directory = "../platform" # Relative to Terraform directory
-services_directory = "../services" # Relative to Terraform directory
-schema_directory = "../infrastructure/schema" # Relative to Terraform directory
+platform_directory = "../platform"              # Relative to Terraform directory
+services_directory = "../services"              # Relative to Terraform directory
+schema_directory   = "../infrastructure/schema" # Relative to Terraform directory
 clouddeploy_config = {
   "location" : "us-central1"
 }
diff --git a/platform/open-match/base/psp/delete-core-psp.yaml b/platform/open-match/base/psp/delete-core-psp.yaml
deleted file mode 100644
index f8a38e2..0000000
--- a/platform/open-match/base/psp/delete-core-psp.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 Google LLC All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$patch: delete
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: open-match-core-podsecuritypolicy
-  namespace: open-match
diff --git a/platform/open-match/base/psp/delete-redis-psp.yaml b/platform/open-match/base/psp/delete-redis-psp.yaml
deleted file mode 100644
index e26bed0..0000000
--- a/platform/open-match/base/psp/delete-redis-psp.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 Google LLC All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$patch: delete
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: open-match-redis-podsecuritypolicy
-  namespace: open-match
diff --git a/platform/open-match/base/psp/delete-service-binding.yaml b/platform/open-match/base/psp/delete-service-binding.yaml
deleted file mode 100644
index e53bb8c..0000000
--- a/platform/open-match/base/psp/delete-service-binding.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 Google LLC All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$patch: delete
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: open-match-service-role-binding
-  namespace: open-match
diff --git a/platform/open-match/base/psp/delete-service-role.yaml b/platform/open-match/base/psp/delete-service-role.yaml
deleted file mode 100644
index ba49030..0000000
--- a/platform/open-match/base/psp/delete-service-role.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 Google LLC All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$patch: delete
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: open-match-service-role
-  namespace: open-match