diff --git a/lib/facter/docker_group_gid.rb b/lib/facter/docker_group_gid.rb
new file mode 100644
index 000000000..633a10297
--- /dev/null
+++ b/lib/facter/docker_group_gid.rb
@@ -0,0 +1,24 @@
+# Copyright 2018 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+Facter.add('docker_group_gid') do
+  setcode do
+    begin
+      File::Stat.new("/var/run/docker.sock").gid
+    rescue
+      nil
+    end
+  end
+end
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index 8556e2860..de3f7e2dd 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -50,9 +50,12 @@ class tripleo::profile::base::mistral::executor (
     if $docker_group {
       ensure_resource('group', 'docker', {
         'ensure' => 'present',
+        'tag'    => 'group',
+        'gid'    => $::docker_group_gid,
       })
       ensure_resource('user', 'mistral', {
         'name'   => 'mistral',
+        'tag'    => 'user',
         'groups' => 'docker',
       })
     }