diff --git a/tcp_tests/environments/lab03_ovs_dpdk/common.yml b/tcp_tests/environment/lab03_ovs_dpdk/common.yml
similarity index 100%
rename from tcp_tests/environments/lab03_ovs_dpdk/common.yml
rename to tcp_tests/environment/lab03_ovs_dpdk/common.yml
diff --git a/tcp_tests/environments/lab03_ovs_dpdk/description.txt b/tcp_tests/environment/lab03_ovs_dpdk/description.txt
similarity index 100%
rename from tcp_tests/environments/lab03_ovs_dpdk/description.txt
rename to tcp_tests/environment/lab03_ovs_dpdk/description.txt
diff --git a/tcp_tests/environments/lab03_ovs_dpdk/init.yml b/tcp_tests/environment/lab03_ovs_dpdk/init.yml
similarity index 100%
rename from tcp_tests/environments/lab03_ovs_dpdk/init.yml
rename to tcp_tests/environment/lab03_ovs_dpdk/init.yml
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/salt.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/salt.yaml
index a6e0ce4..2e5b44f 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/salt.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/salt.yaml
@@ -6,6 +6,9 @@
 {% set SALT_MODELS_COMMIT = os_env('SALT_MODELS_COMMIT','master') %}
 {% set SALT_MODELS_SYSTEM_COMMIT = os_env('SALT_MODELS_SYSTEM_COMMIT','') %}
 
+# Environment model name stored in https://github.com/Mirantis/tcp-qa/tree/master/tcp_tests/environments
+{% set ENVIRONMENT_MODEL_NAME = os_env('ENVIRONMENT_MODEL_NAME','lab03_ovs_dpdk') %}
+
 # Reference to a patch that should be applied to the model if required, for example: export SALT_MODELS_REF_CHANGE=refs/changes/19/7219/12
 {% set SALT_MODELS_REF_CHANGE = os_env('SALT_MODELS_REF_CHANGE', '') %}
 
@@ -169,6 +172,25 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+
+- description: "[EXPERIMENTAL] Remove linux.network.interface object from the cluster/system models and use fixed 'environment' model instead"
+  cmd: |
+    apt-get -y install python-virtualenv python-pip build-essential python-dev libssl-dev;
+    pip install git+https://github.com/dis-xcom/reclass-tools;
+    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/cluster/;
+    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/system/;
+    reclass-tools del-key parameters.linux.network.interface /usr/share/salt-formulas/reclass/;
+    git clone https://github.com/Mirantis/tcp-qa /tmp/tcp-qa;
+    ln -s /tmp/tcp-qa/tcp_tests/environment/ /srv/salt/reclass/classes;
+    if ! reclass-tools get-key 'classes' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml | grep -q "environment.{{ ENVIRONMENT_MODEL_NAME }}$"; then
+      reclass-tools add-key 'classes' 'environment.{{ ENVIRONMENT_MODEL_NAME }}' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml --merge ;
+    fi;
+
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
+
 {% for ssh in config.underlay.ssh %}
 - description: Configure salt-minion on {{ ssh['node_name'] }}
   cmd: |