diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
index 84b452c12d..6c91ae736a 100644
--- a/build_library/disk_layout.json
+++ b/build_library/disk_layout.json
@@ -26,7 +26,7 @@
       "3":{
         "label":"USR-A",
         "uuid":"7130c94a-213a-4e5a-8e26-6cce9662f132",
-        "type":"flatcar-rootfs",
+        "type":"coreos-rootfs",
         "blocks":"2097152",
         "fs_blocks":"260094",
         "fs_type":"ext2",
@@ -36,7 +36,7 @@
       "4":{
         "label":"USR-B",
         "uuid":"e03dd35c-7c2d-4a47-b3fe-27f15780a57c",
-        "type":"flatcar-rootfs",
+        "type":"coreos-rootfs",
         "blocks":"2097152",
         "fs_blocks":"262144"
       },
@@ -56,18 +56,18 @@
       },
       "7":{
         "label":"OEM-CONFIG",
-        "type":"flatcar-reserved",
+        "type":"coreos-reserved",
         "blocks":"131072"
       },
       "8":{
         "type":"blank",
-        "label":"flatcar-reserved",
+        "label":"coreos-reserved",
         "blocks":"0"
       },
       "9":{
         "label":"ROOT",
         "fs_label":"ROOT",
-        "type":"flatcar-resize",
+        "type":"coreos-resize",
         "blocks":"4427776",
         "fs_type":"ext4",
         "mount":"/"
diff --git a/build_library/disk_util b/build_library/disk_util
index 42b2880c53..0e79976860 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -400,7 +400,7 @@ def FormatExt(part, device):
   if 'fs_label' in part:
     tune_cmd += ['-L', part['fs_label']]
 
-  if part['type'] == 'flatcar-usr':
+  if part['type'] == 'coreos-usr':
     tune_cmd += ['-U', 'clear',
                  '-T', '20091119110000',
                  '-c', '0', '-i', '0', # Disable auto fsck
diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index 90c7675cb4..c6b71353b3 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -19,7 +19,7 @@ set randomize_disk_guid=""
 set oem_id=""
 
 # Anything else the OEM adds should use this variable.
-set linux_append=""
+set linux_append="systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false"
 
 set secure_boot="0"
 
diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh
index 476eb3445d..f4ab9e3072 100644
--- a/build_library/test_image_content.sh
+++ b/build_library/test_image_content.sh
@@ -5,9 +5,9 @@
 GLSA_WHITELIST=(
 	201412-09 # incompatible CA certificate version numbers
 	201908-14 # backported both CVE fixes
+	201909-01 # perl
+	201909-08 # dbus
 	201904-13 # git
-	201909-01 # Perl, SDK only
-	201909-08 # backported fix
 )
 
 glsa_image() {
diff --git a/build_torcx_store b/build_torcx_store
index d18c458bcf..cbf4c36ba4 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -237,14 +237,12 @@ function torcx_package() {
 # for each package will point at the last version specified.  This can handle
 # swapping default package versions for different OS releases by reordering.
 DEFAULT_IMAGES=(
-        =app-torcx/docker-1.12
         =app-torcx/docker-19.03
 )
 
 # This list contains extra images which will be uploaded and included in the
 # generated manifest, but won't be included in the vendor store.
 EXTRA_IMAGES=(
-	=app-torcx/docker-17.03
 )
 
 mkdir -p "${BUILD_DIR}"