diff --git a/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_compute.yaml b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_compute.yaml
new file mode 100644
index 00000000000..dbdd605d86c
--- /dev/null
+++ b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_compute.yaml
@@ -0,0 +1,17 @@
+---
+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+ENV_DATA:
+  platform: 'gcp'
+  deployment_type: 'ipi'
+  region: 'europe-west1'
+  base_domain: 'gcp.qe.rh-ocs.com'
+  gcp_project_id: 'odf-qe'
+  worker_replicas: 3
+  master_replicas: 3
+  master_instance_type: 'n2-standard-16'
+  worker_instance_type: 'n2-standard-16'
+  worker_secure_boot: 'Enabled'
+REPORTING:
+  polarion:
+    deployment_id: 'OCS-2372'
diff --git a/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_control_plane.yaml b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_control_plane.yaml
new file mode 100644
index 00000000000..b3bdb54cc59
--- /dev/null
+++ b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_control_plane.yaml
@@ -0,0 +1,17 @@
+---
+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+ENV_DATA:
+  platform: 'gcp'
+  deployment_type: 'ipi'
+  region: 'europe-west1'
+  base_domain: 'gcp.qe.rh-ocs.com'
+  gcp_project_id: 'odf-qe'
+  worker_replicas: 3
+  master_replicas: 3
+  master_instance_type: 'n2-standard-16'
+  worker_instance_type: 'n2-standard-16'
+  master_secure_boot: 'Enabled'
+REPORTING:
+  polarion:
+    deployment_id: 'OCS-2372'
diff --git a/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
new file mode 100644
index 00000000000..d40d94e9801
--- /dev/null
+++ b/conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
@@ -0,0 +1,17 @@
+---
+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+ENV_DATA:
+  platform: 'gcp'
+  deployment_type: 'ipi'
+  region: 'europe-west1'
+  base_domain: 'gcp.qe.rh-ocs.com'
+  gcp_project_id: 'odf-qe'
+  worker_replicas: 3
+  master_replicas: 3
+  master_instance_type: 'n2-standard-16'
+  worker_instance_type: 'n2-standard-16'
+  machine_secure_boot: 'Enabled'
+REPORTING:
+  polarion:
+    deployment_id: 'OCS-2372'
diff --git a/ocs_ci/ocs/platform_nodes.py b/ocs_ci/ocs/platform_nodes.py
index 22866ab0812..dcb671b3082 100644
--- a/ocs_ci/ocs/platform_nodes.py
+++ b/ocs_ci/ocs/platform_nodes.py
@@ -3068,4 +3068,5 @@ def restart_nodes_by_stop_and_start_teardown(self):
         """
         not_ready_nodes = get_nodes_in_statuses([constants.NODE_NOT_READY])
         node_names = [n.name for n in not_ready_nodes]
-        self.gcp.start_instances(node_names)
+        if node_names:
+            self.gcp.start_instances(node_names)
diff --git a/ocs_ci/templates/ocp-deployment/install-config-gcp-ipi.yaml.j2 b/ocs_ci/templates/ocp-deployment/install-config-gcp-ipi.yaml.j2
index 7827706ae4f..9ed014e3a4d 100644
--- a/ocs_ci/templates/ocp-deployment/install-config-gcp-ipi.yaml.j2
+++ b/ocs_ci/templates/ocp-deployment/install-config-gcp-ipi.yaml.j2
@@ -5,6 +5,9 @@ compute:
     platform:
       gcp:
         type: {{ worker_instance_type }}
+{% if worker_secure_boot %}
+        secureBoot: {{ worker_secure_boot }}
+{% endif %}
 {% if worker_availability_zones %}
         zones:
 {% for zone in worker_availability_zones %}
@@ -17,6 +20,9 @@ controlPlane:
   platform:
     gcp:
       type: {{ master_instance_type }}
+{% if master_secure_boot %}
+      secureBoot: {{ master_secure_boot }}
+{% endif %}
 {% if master_availability_zones %}
       zones:
 {% for zone in master_availability_zones %}
@@ -42,4 +48,8 @@ platform:
   gcp:
     projectID: {{ gcp_project_id }}
     region: {{ region }}
+{% if machine_secure_boot %}
+    defaultMachinePlatform:
+      secureBoot: {{ machine_secure_boot }}
+{% endif %}
 pullSecret: ''