diff --git a/checklist.yaml b/checklist.yaml
new file mode 100644
index 0000000..570b16f
--- /dev/null
+++ b/checklist.yaml
@@ -0,0 +1,129 @@
+tests:
+#  - title: 'tempest.api.compute.admin.test_servers.ServersAdminTestJSON.test_list_servers_by_admin[id-51717b38-bdc1-458b-b636-1cf82d99f62f]'
+#    status: 'ProdFailed'
+#    errors:
+#      - 'tempest.exceptions.BuildErrorException: Server'
+#      - 'Exceeded maximum number of retries. Exhausted all hosts available for retrying build failures for instance'
+#    defects: 'PROD-25148'
+#
+#  - title: 'tempest.api.compute.admin.test_servers.ServersAdminTestJSON.test_create_server_with_scheduling_hint[id-fdcd9b33-0903-4e00-a1f7-b5f6543068d6]'
+#    status: 'InfraFailed'
+
+  - title: 'tempest.api.network.admin.test_routers.RoutersAdminTest.test_update_router_set_gateway[id-6cc285d8-46bf-4f36-9b1a-783e3008ba79]'
+    errors:
+      - 'testtools.matchers._impl.MismatchError: 0 != 1'
+    status: "ProdFailed"
+    defects: 'PROD-25134'
+
+  - title: 'tempest.api.network.admin.test_routers.RoutersAdminTest.test_update_router_set_gateway[id-6cc285d8-46bf-4f36-9b1a-783e3008ba79]'
+    errors:
+      - 'testtools.matchers._impl.MismatchError: 0 != 1'
+    status: "ProdFailed"
+    defects: 'PROD-25134'
+
+  - title: 'test_prometheus_alert_count[ReclassRemoteDesync]'
+    errors:
+      - "local files under /srv/salt/reclass have diverged from expected remote state"
+    status: "Won't Fix"
+
+  - title: "test_prometheus_alert_count[ContrailBGPSessionsDown]"
+    errors:
+      - "1 OpenContrail BGP sessions on the ntw01 node are down for 2 minutes."
+    status: "ProdFailed"
+    defects: 'PROD-34379'
+
+## ==================================================
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_delete_image_metadata_item"
+    errors:
+      - "502 PUT https://10.6.0.80:8774/v2.1/images/"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_paused_server"
+    errors:
+      - "502 GET https://10.6.0.80:8774/v2.1/images/"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_stopped_server"
+    errors:
+      - "502 GET https://10.6.0.80:8774/v2.1/images/"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_suspended_server"
+    errors:
+      - "502 GET https://10.6.0.80:8774/v2.1/images/"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image"
+    errors:
+      - "502 GET https://10.6.0.80:8774/v2.1/images/"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+
+  - title: ".setUpClass (tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON)"
+    errors:
+      - "cls.server2['id'], wait_until='ACTIVE')"
+      - "tempest.lib.exceptions.UnexpectedResponseCode: Unexpected response code received"
+      - "Details: 502"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image"
+    errors:
+      - "message': u\"Cannot 'createImage' instance"
+      - "while it is in task_state image_uploading\", u'code': 409"
+    status: "ProdFailed"
+    defects: "PROD-35223"
+
+
+# ---------------------------------------------------
+  - title: "tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_get_console_output_server_id_in_shutoff_status"
+    errors:
+      - "Details: {u'message': u'Guest does not have a console available.', u'code': 404}"
+    status: "ProdFailed"
+    defects: PROD-35224
+
+  - title: "tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_create_ebs_image_and_check_boot[compute,id-36c34c67-7b54-4b59-b188-02a2f458a63b,image,volume]"
+    errors:
+      - "Invalid volume: Volume status must be available or error or error_restoring or error_extending or error_managing and must not be migrating, attached, belong to a group, have snapshots or be disassociated from snapshots after volume transfer"
+    status: "ProdFailed"
+    defects: PROD-35217
+
+  - title: "tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_create_server_from_volume_snapshot[compute,id-05795fb2-b2a7-4c9f-8fac-ff25aedb1489,image,slow,volume]"
+    errors:
+      - "Invalid volume: Volume status must be available or error or error_restoring or error_extending or error_managing and must not be migrating, attached, belong to a group, have snapshots or be disassociated from snapshots after volume transfer"
+    status: "ProdFailed"
+    defects: PROD-35217
+
+  - title: ".setUpClass (tempest.api.network.admin.test_agent_management.AgentManagementTestJSON)"
+    errors:
+      - 'File "/usr/local/lib/python2.7/dist-packages/tempest/api/network/admin/test_agent_management.py", line 35, in resource_setup'
+      - "IndexError: list index out of range"
+    status: "ProdFailed"
+    defects: PROD-25221
+
+
+
+## ==================================================
+#             CVP SANITY
+## ==================================================
+
+  - title: "test_prometheus_alert_count[ReclassRemoteDesync]"
+    errors:
+      - "local files under /srv/salt/reclass have diverged from expected remote state"
+    status: "WontFix"
+
+
+## ==================================================
+#              LMA2.0_Automated
+## ==================================================
+  - title: "test_openstack_api_check_status_metrics "
+    errors:
+      - "Incorrect value in metric {u'value': [1600846840.578, u'0'], u'metric': {u'service_name': u'opencontrail', u'interface': u'public', u'service_id': u'35662704fa664daf95de90abc5180139', u'region': u'RegionOne', u'name': u'opencontrail', u'job': u'remote_agent_openstack_api', u'environment': u'heat-cicd-queens-contrail41-sl.local', u'instance': u'monitoring_remote_agent:9128', u'endpoint_id': u'721e2ad9e82148c9b5dbde40db83e47e', u'__name__': u'openstack_api_check_status'}}"
+    status: "WontFix"
+    defects: "PROD-35759"
+
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/tempest_skip.list b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/tempest_skip.list
index 4698a42..8add75d 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/tempest_skip.list
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/tempest_skip.list
@@ -47,4 +47,46 @@
 tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state
 
 # PROD-25586 [OC4.x][Tempest] Heat can't update port's mac address
-heat_tempest_plugin.tests.functional.test_create_update_neutron_port.UpdatePortTest.test_update_with_mac_address
\ No newline at end of file
+heat_tempest_plugin.tests.functional.test_create_update_neutron_port.UpdatePortTest.test_update_with_mac_address
+
+# PROD-33000 [OC][Infra] Instances don't have access to external net
+tempest.api.compute.admin.test_create_server.ServersWithSpecificFlavorTestJSON.test_verify_created_server_ephemeral_disk
+tempest.api.compute.servers.test_create_server.ServersTestBootFromVolume.test_host_name_is_same_as_server_name
+tempest.api.compute.servers.test_create_server.ServersTestBootFromVolume.test_verify_created_server_vcpus
+tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name
+tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_created_server_vcpus
+tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_host_name_is_same_as_server_name
+tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_created_server_vcpus
+tempest.api.compute.servers.test_device_tagging.DeviceTaggingTest.test_device_tagging
+tempest.api.compute.servers.test_device_tagging.DeviceTaggingTestV2_42.test_device_tagging
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server_with_volume_attached
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_volume_backed_server_confirm
+tempest.api.compute.volumes.test_attach_volume.AttachVolumeShelveTestJSON.test_attach_volume_shelved_or_offload_server
+tempest.api.compute.volumes.test_attach_volume.AttachVolumeShelveTestJSON.test_detach_volume_shelved_or_offload_server
+tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_attach_detach_volume
+tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration_revert
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_pause_unpause
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_reboot
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_rebuild
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_resize
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_stop_start
+tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_suspend_resume
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_boot_into_disabled_port_security_network_without_secgroup
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_cross_tenant_traffic
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_in_tenant_traffic
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_multiple_security_groups
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_port_security_disable_security_group
+tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_port_update_new_security_group
+tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
+tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_instance
+tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_volume_backed_instance
+tempest.scenario.test_snapshot_pattern.TestSnapshotPattern.test_snapshot_pattern
+tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern
+