diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 107ee5a..63f7d86 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -82,9 +82,8 @@
 docker-compose-contrail-collector-env:
   file.managed:
   - name: /etc/docker/compose/opencontrail/contrail.env
-  - contents:
-    - "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
-    - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
+  - source: salt://opencontrail/files/{{ collector.version }}/contrail.env
+  - template: jinja
   - makedirs: true
   - require:
     - user: user_contrail_collector
diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 1edfa54..36c1a9f 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -73,9 +73,8 @@
 docker-compose-contrail-control-env:
   file.managed:
   - name: /etc/docker/compose/opencontrail/contrail.env
-  - contents:
-    - "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
-    - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
+  - source: salt://opencontrail/files/{{ control.version }}/contrail.env
+  - template: jinja
   - makedirs: true
   - require:
     - user: user_contrail
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index e48a48c..ecdc004 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -77,9 +77,8 @@
 docker-compose-contrail-database-env:
   file.managed:
   - name: /etc/docker/compose/opencontrail/contrail.env
-  - contents:
-    - "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
-    - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
+  - source: salt://opencontrail/files/{{ database.version }}/contrail.env
+  - template: jinja
   - makedirs: true
   - require:
     - user: user_contrail_database
diff --git a/opencontrail/files/4.0/contrail.env b/opencontrail/files/4.0/contrail.env
new file mode 100644
index 0000000..eed4e23
--- /dev/null
+++ b/opencontrail/files/4.0/contrail.env
@@ -0,0 +1,5 @@
+CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}
+CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}
+{%- if pillar.opencontrail.config is defined %}
+API_WORKERS={{ pillar.opencontrail.config.get('api',{}).get("workers_count", 0) }}
+{%- endif %}