diff --git a/image-1.3.tar.xz b/image-1.3.tar.xz
new file mode 100644
index 0000000..40bfea9
--- /dev/null
+++ b/image-1.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26577e5a9bf7cbf7913223f62aa5c59b2a79842cb0079856e72877b5cea5e51c
+size 256752
diff --git a/image.tar.xz b/image.tar.xz
deleted file mode 100644
index 948e07d..0000000
--- a/image.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bec77240b7eda9a6e5700e5390dcc8fddb7d40429f2f8ac9346d9e8fef31fe44
-size 223088
diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 73ff3b9..a1e7a4d 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Jan 25 14:30:45 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Upgrade to storage v1.8
+  * Check for the OS when setting btrfs/libdm/ostree tags
+- Upgrade to image v1.3
+  * vendor: use github.com/klauspost/pgzip instead of compress/gzip
+  * vendor latest ostree
+- Refactor specfile to use versioned tarballs
+- Established package versioning scheme (ISODATE of change)
+- Remove non-upstream storage.conf
+- Set btrfs as default driver if /var/lib is on btrfs [boo#1123119]
+- Version 20190125
+
+-------------------------------------------------------------------
+Thu Jan 17 14:20:49 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Upgrade to storage v1.6
+  * Remove private mount from zfs driver
+  * Update zfs driver to be closer to moby driver
+  * Use mount options when mounting the chown layer.
+
 -------------------------------------------------------------------
 Sun Jan 13 15:39:42 UTC 2019 - Richard Brown <rbrown@suse.com>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index f434c7c..b0e44fd 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -15,22 +15,29 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+# libpodver - version from containers/libpod
+%define libpodver 1.0.0
+
+# storagever - version from containers/storage
+%define storagever 1.8
+
+# imagever - version from containers/image
+%define imagever 1.3
 
 Name:           libcontainers-common
-Version:        0.0.1
+Version:        20190125
 Release:        0
 Summary:        Configuration files common to github.com/containers
 License:        Apache-2.0
 Group:          System/Management
 URL:            https://github.com/containers
-Source0:        image.tar.xz
-Source1:        storage.tar.xz
+Source0:        image-%{imagever}.tar.xz
+Source1:        storage-%{storagever}.tar.xz
 Source2:        LICENSE
 Source3:        policy.json
-Source4:        storage.conf
 Source5:        mounts.conf
 Source6:        registries.conf
-Source7:        libpod.tar.xz
+Source7:        libpod-%{libpodver}.tar.xz
 BuildRequires:  go-go-md2man
 Provides:       libcontainers-image
 Provides:       libcontainers-storage
@@ -43,9 +50,9 @@ Configuration files and manpages shared by tools that are based on the
 github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo.
 
 %prep
-%setup -q -T -D -b 0 -n image
-%setup -q -T -D -b 1 -n storage
-%setup -q -T -D -b 7 -n storage
+%setup -q -T -D -b 0 -n image-%{imagever}
+%setup -q -T -D -b 1 -n storage-%{storagever}
+%setup -q -T -D -b 7 -n libpod-%{libpodver}
 # copy the LICENSE file in the build root
 cd ..
 cp %{SOURCE2} .
@@ -54,7 +61,7 @@ cp %{SOURCE2} .
 cd ..
 pwd
 # compile containers/image manpages
-cd image
+cd image-%{imagever}
 for md in docs/*.md
 do
 	go-md2man -in $md -out $md
@@ -63,7 +70,7 @@ rename '.5.md' '.5' docs/*
 rename '.md' '.1' docs/*
 cd ..
 # compile containers/storage manpages
-cd storage
+cd storage-%{storagever}
 for md in docs/*.5.md
 do
 	go-md2man -in $md -out $md
@@ -71,7 +78,7 @@ done
 rename '.5.md' '.5' docs/*
 cd ..
 # compile subset of containers/libpod manpages
-cd libpod
+cd libpod-%{libpodver}
 go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5
 cd ..
 
@@ -83,18 +90,26 @@ install -d -m 0755 %{buildroot}/%{_datadir}/containers/oci/hooks.d
 install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers/registries.d
 
 install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json
-install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.conf
+install -D -m 0644 storage-%{storagever}/storage.conf %{buildroot}/%{_sysconfdir}/containers/storage.conf
 install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
 install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf
 install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf
-install -D -m 0644 libpod/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
-install -D -m 0644 libpod/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json
+install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
+install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json
 
 install -d %{buildroot}/%{_mandir}/man1
 install -d %{buildroot}/%{_mandir}/man5
-install -D -m 0644 image/docs/*.1 %{buildroot}/%{_mandir}/man1/
-install -D -m 0644 storage/docs/*.5 %{buildroot}/%{_mandir}/man5/
-install -D -m 0644 libpod/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
+install -D -m 0644 image-%{imagever}/docs/*.1 %{buildroot}/%{_mandir}/man1/
+install -D -m 0644 storage-%{storagever}/docs/*.5 %{buildroot}/%{_mandir}/man5/
+install -D -m 0644 libpod-%{libpodver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
+
+%post
+# If installing, check if /var/lib is btrfs and set it driver to "btrfs" if not
+if [ $1 -eq 1 ] ; then
+  if [ "`findmnt -o FSTYPE -l --target /var/lib|grep -v FSTYPE`" = "btrfs" ]; then
+    sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
+  fi
+fi
 
 %files
 %dir %{_sysconfdir}/containers
@@ -117,4 +132,4 @@ install -D -m 0644 libpod/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man
 %{_mandir}/man5/*.5%{?ext_man}
 %license LICENSE
 
-%changelog
+%changelog
\ No newline at end of file
diff --git a/libpod-1.0.0.tar.xz b/libpod-1.0.0.tar.xz
new file mode 100644
index 0000000..38f7ea7
--- /dev/null
+++ b/libpod-1.0.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:046e12021a69bd27e07e9ecb8f4bd2e045ef825c16bdf2e5d8ddc46a4a6868f7
+size 3525980
diff --git a/libpod.tar.xz b/libpod.tar.xz
deleted file mode 100644
index b4e6b27..0000000
--- a/libpod.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1495331c41be52ffbb109437d3ce954b0266f9cba0a6712613a54adb2094f10e
-size 3526180
diff --git a/storage-1.8.tar.xz b/storage-1.8.tar.xz
new file mode 100644
index 0000000..b671a85
--- /dev/null
+++ b/storage-1.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6efe2b38ebfc844aef87c93a5e7b25f7e121bfbcfd96edc37d9ffa9a9adc065
+size 796852
diff --git a/storage.conf b/storage.conf
deleted file mode 100644
index c3db15e..0000000
--- a/storage.conf
+++ /dev/null
@@ -1,133 +0,0 @@
-# This file is is the configuration file for all tools
-# that use the containers/storage library.
-# See man 5 containers-storage.conf for more information
-# The "container storage" table contains all of the server options.
-[storage]
-
-# Default Storage Driver
-driver = "btrfs"
-
-# Temporary storage location
-runroot = "/var/run/containers/storage"
-
-# Primary Read/Write location of container storage
-graphroot = "/var/lib/containers/storage"
-
-[storage.options]
-# Storage options to be passed to underlying storage drivers
-
-# AdditionalImageStores is used to pass paths to additional Read/Only image stores
-# Must be comma separated list.
-additionalimagestores = [
-]
-
-# Size is used to set a maximum size of the container image.  Only supported by
-# certain container storage drivers.
-size = ""
-
-# Path to an helper program to use for mounting the file system instead of mounting it
-# directly.
-#mount_program = "/usr/bin/fuse-overlayfs"
-
-# OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
-# override_kernel_check = "false"
-
-# mountopt specifies comma separated list of extra mount options
-# mountopt = "nodev"
-
-# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
-# a container, to UIDs/GIDs as they should appear outside of the container, and
-# the length of the range of UIDs/GIDs.  Additional mapped sets can be listed
-# and will be heeded by libraries, but there are limits to the number of
-# mappings which the kernel will allow when you later attempt to run a
-# container.
-#
-# remap-uids = 0:1668442479:65536
-# remap-gids = 0:1668442479:65536
-
-# Remap-User/Group is a name which can be used to look up one or more UID/GID
-# ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting
-# with an in-container ID of 0 and the a host-level ID taken from the lowest
-# range that matches the specified name, and using the length of that range.
-# Additional ranges are then assigned, using the ranges which specify the
-# lowest host-level IDs first, to the lowest not-yet-mapped container-level ID,
-# until all of the entries have been used for maps.
-#
-# remap-user = "storage"
-# remap-group = "storage"
-
-# If specified, use OSTree to deduplicate files with the overlay backend
-ostree_repo = ""
-
-# Set to skip a PRIVATE bind mount on the storage home directory.  Only supported by
-# certain container storage drivers
-# skip_mount_home = "false"
-
-[storage.options.thinpool]
-# Storage Options for thinpool
-
-# autoextend_percent determines the amount by which pool needs to be
-# grown. This is specified in terms of % of pool size. So a value of 20 means
-# that when threshold is hit, pool will be grown by 20% of existing
-# pool size.
-# autoextend_percent = "20"
-
-# autoextend_threshold determines the pool extension threshold in terms
-# of percentage of pool size. For example, if threshold is 60, that means when
-# pool is 60% full, threshold has been hit.
-# autoextend_threshold = "80"
-
-# basesize specifies the size to use when creating the base device, which
-# limits the size of images and containers.
-# basesize = "10G"
-
-# blocksize specifies a custom blocksize to use for the thin pool.
-# blocksize="64k"
-
-# directlvm_device specifies a custom block storage device to use for the
-# thin pool. Required if you setup devicemapper.
-# directlvm_device = ""
-
-# directlvm_device_force wipes device even if device already has a filesystem.
-# directlvm_device_force = "True"
-
-# fs specifies the filesystem type to use for the base device.
-# fs="xfs"
-
-# log_level sets the log level of devicemapper.
-# 0: LogLevelSuppress 0 (Default)
-# 2: LogLevelFatal
-# 3: LogLevelErr
-# 4: LogLevelWarn
-# 5: LogLevelNotice
-# 6: LogLevelInfo
-# 7: LogLevelDebug
-# log_level = "7"
-
-# min_free_space specifies the min free space percent in a thin pool require for
-# new device creation to succeed. Valid values are from 0% - 99%.
-# Value 0% disables
-# min_free_space = "10%"
-
-# mkfsarg specifies extra mkfs arguments to be used when creating the base.
-# device.
-# mkfsarg = ""
-
-# use_deferred_removal marks devicemapper block device for deferred removal.
-# If the thinpool is in use when the driver attempts to remove it, the driver
-# tells the kernel to remove it as soon as possible. Note this does not free
-# up the disk space, use deferred deletion to fully remove the thinpool.
-# use_deferred_removal = "True"
-
-# use_deferred_deletion marks thinpool device for deferred deletion.
-# If the device is busy when the driver attempts to delete it, the driver
-# will attempt to delete device every 30 seconds until successful.
-# If the program using the driver exits, the driver will continue attempting
-# to cleanup the next time the driver is used. Deferred deletion permanently
-# deletes the device and all data stored in device will be lost.
-# use_deferred_deletion = "True"
-
-# xfs_nospace_max_retries specifies the maximum number of retries XFS should
-# attempt to complete IO when ENOSPC (no space) error is returned by
-# underlying storage device.
-# xfs_nospace_max_retries = "0"
diff --git a/storage.tar.xz b/storage.tar.xz
deleted file mode 100644
index a2636c3..0000000
--- a/storage.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22eee59b46070f2d608e56f1664238969511c1a8e0a0cc24a2671ba19c76656d
-size 795144