diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index c229cf35cd..402e35cf5a 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_torcx_store b/build_torcx_store
index 926182974d..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-18.06
+        =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}"