diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
index dd08100..8974e6e 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
@@ -5,8 +5,8 @@
       - infra_config
       - linux_system_codename_xenial
       - features_runtest_cfg
-      classes:
-      - environment.cookied-cicd-pike-dvr-ceph.override_ntp_virtual
+      #classes:
+      #- environment.cookied-cicd-pike-dvr-ceph.override_ntp_virtual
       interfaces:
         ens3:
           role: single_dhcp
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
index 065d10f..f735daa 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
@@ -5,8 +5,8 @@
       - infra_config
       - linux_system_codename_xenial
       - features_runtest
-      classes:
-      - environment.cookied-cicd-pike-dvr-sl.override_ntp_virtual
+      #classes:
+      #- environment.cookied-cicd-pike-dvr-sl.override_ntp_virtual
       interfaces:
         ens3:
           role: single_dhcp
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
index 2efd47d..9d5f841 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
@@ -5,8 +5,8 @@
       - infra_config
       - linux_system_codename_xenial
       - features_runtest_cfg
-      classes:
-      - environment.cookied-cicd-queens-dvr-sl.override_ntp_virtual
+      #classes:
+      #- environment.cookied-cicd-queens-dvr-sl.override_ntp_virtual
       interfaces:
         ens3:
           role: single_dhcp
diff --git a/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml b/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
index 057ef10..ccc417d 100644
--- a/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
+++ b/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
@@ -5,8 +5,8 @@
       - infra_config
       - linux_system_codename_xenial
       - features_runtest
-      classes:
-      - environment.cookied-small-mcp-ironic.override_ntp_virtual
+      #classes:
+      #- environment.cookied-small-mcp-ironic.override_ntp_virtual
       interfaces:
         ens3:
           role: single_dhcp