diff --git a/baselayout/group b/baselayout/group
index 8924f21..98c8a50 100644
--- a/baselayout/group
+++ b/baselayout/group
@@ -46,6 +46,7 @@ systemd-journal:x:248:core
 dialout:x:249:
 portage:x:250:core
 rkt:x:251:core
+fleet:x:252:core
 utmp:x:406:
 core:x:500:
 nogroup:x:65533:
diff --git a/baselayout/passwd b/baselayout/passwd
index 02e9bf4..12e1b76 100644
--- a/baselayout/passwd
+++ b/baselayout/passwd
@@ -28,5 +28,6 @@ systemd-resolve:x:245:245:Network Name Resolution:/dev/null:/sbin/nologin
 systemd-bus-proxy:x:246:246:Legacy D-Bus Proxy:/dev/null:/sbin/nologin
 systemd-journal-gateway:x:247:247:Journal Gateway:/var/log/journal:/sbin/nologin
 portage:x:250:250:portage:/var/tmp/portage:/sbin/nologin
+fleet:x:252:252::/dev/null:/sbin/nologin
 core:x:500:500:CoreOS Admin:/home/core:/bin/bash
 nobody:x:65534:65534:nobody:/var/empty:/sbin/nologin
diff --git a/scripts/coreos-tmpfiles b/scripts/coreos-tmpfiles
index f712325..5b7f312 100644
--- a/scripts/coreos-tmpfiles
+++ b/scripts/coreos-tmpfiles
@@ -10,7 +10,7 @@ BASE="${ROOT}/usr/share/baselayout"
 
 # Users/Groups to copy so they can be modified
 COPY_USERS="root|core"
-COPY_GROUPS="docker|rkt|sudo|wheel"
+COPY_GROUPS="docker|rkt|fleet|sudo|wheel"
 
 # readable files
 umask 022
diff --git a/tmpfiles.d/baselayout.conf b/tmpfiles.d/baselayout.conf
index 97383a8..321843a 100644
--- a/tmpfiles.d/baselayout.conf
+++ b/tmpfiles.d/baselayout.conf
@@ -7,6 +7,7 @@ d   /proc       -       -   -   -   -
 d   /root       0700    -   -   -   -
 d   /run        -       -   -   -   -
 d   /run/lock   -       -   -   -   -
+d   /run/fleet  0740   252 252  -   -
 d   /srv        -       -   -   -   -
 d   /sys        -       -   -   -   -
 d   /var        0755    -   -   -   -