diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index f9b5198..4534ea8 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -73,6 +73,16 @@
   - template: jinja
 {%- endif %}
 
+{%- if collector.version >= 4.0 %}
+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('uid', 0) }}"
+  - makedirs: true
+{%- endif %}
+
 {%- if collector.version == 3.0 %}
 
 /etc/contrail/supervisord_analytics_files/contrail-analytics-nodemgr.ini:
diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 3727517..0883d5f 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -69,6 +69,14 @@
   file.managed:
   - source: salt://opencontrail/files/{{ control.version }}/contrail-issu.conf
   - template: jinja
+
+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('uid', 0) }}"
+  - makedirs: true
 {%- endif %}
 
 {%- if control.version == 3.0 and control.get('dns', {}).get('forwarders', False) %}
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 56a3d61..ccd27a0 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -61,6 +61,13 @@
   - template: jinja
   - makedirs: true
 
+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('uid', 0) }}"
+  - makedirs: true
 {% endif %}
 
 {{ database.cassandra_config }}logback.xml: