diff --git a/.travis.Dockerfile b/.travis.Dockerfile
index 00ce1dbdd7..0ba05d35cf 100644
--- a/.travis.Dockerfile
+++ b/.travis.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:artful
+FROM ubuntu:18.04
 
 RUN apt-get -qq update && \
     apt-get install -y sudo docker.io git make btrfs-tools libdevmapper-dev libgpgme-dev libostree-dev
diff --git a/Makefile b/Makefile
index 2210921769..98cee3ac7c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # Which github repository and branch to use for testing with skopeo
 SKOPEO_REPO = containers/skopeo
-SKOPEO_BRANCH = master
+SKOPEO_BRANCH = 2b97124e
 # Set SUDO=sudo to run container integration tests using sudo.
 SUDO =
 
@@ -70,9 +70,10 @@ test-skopeo:
 	@export GOPATH=$$(mktemp -d) && \
 		skopeo_path=$${GOPATH}/src/github.com/containers/skopeo && \
 		vendor_path=$${skopeo_path}/vendor/github.com/containers/image && \
-		git clone -b $(SKOPEO_BRANCH) https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
-		rm -rf $${vendor_path} && cp -r . $${vendor_path} && rm -rf $${vendor_path}/vendor && \
-		cd $${skopeo_path} && \
+		git clone https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
+		cd $${skopeo_path} && git checkout $(SKOPEO_BRANCH) && \
+		sed -i 's/FROM fedora/FROM fedora:30/g' Dockerfile && \
+		rm -rf $${vendor_path} && cp -r /gopath/src/github.com/containers/image $${vendor_path} && rm -rf $${vendor_path}/vendor && \
 		make BUILDTAGS="$(BUILDTAGS)" binary-local test-all-local && \
 		$(SUDO) make BUILDTAGS="$(BUILDTAGS)" check && \
 		rm -rf $${skopeo_path}
@@ -82,7 +83,7 @@ fmt:
 
 validate: lint
 	@go vet $(PACKAGES)
-	@test -z "$$(gofmt -s -l . | grep -ve '^vendor' | tee /dev/stderr)"
+	@test -z "$$(gofmt -s -l . | grep -ve '^vendor' | grep -ve docker/tarfile/src.go | tee /dev/stderr)"
 
 lint:
 	@out="$$(golint $(PACKAGES))"; \
diff --git a/oci/layout/fixtures/accepted_certs/cacert.crt b/oci/layout/fixtures/accepted_certs/cacert.crt
index 209b65ed18..c0f97b18ec 100644
--- a/oci/layout/fixtures/accepted_certs/cacert.crt
+++ b/oci/layout/fixtures/accepted_certs/cacert.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICDTCCAW+gAwIBAgITAMl3oYcdOUmREbQgdp8bH1lh4TAKBggqhkjOPQQDBDAS
-MRAwDgYDVQQKDAdBY21lIENvMB4XDTE4MDkyNTIxMjkwOFoXDTE5MDkyNTIxMjkw
-OFowEjEQMA4GA1UECgwHQWNtZSBDbzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
-AI3pxckijV44L3ffAlLOqB4oA/HpP7S5gTpWrIUU+2SxFJU/bcTKDLPk1cEC87vW
-+UCYIXAyYGlyMAGSm0GxAFHnAIIrQzx9m3yiHbUyIPvRMW4BoDKsLaf5+GIZMm9n
-Oq2qnjvHr9ag2J3IzxEqQ8KZ95ivmHYrh3VsnfisI7c3opiro2EwXzAOBgNVHQ8B
-Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0RBBYwFIIJbG9jYWxob3N0gQdhQGEuY29tMAoGCCqGSM49
-BAMEA4GLADCBhwJCAIjq1eQF+Sn2Z46AVA5qfn4Eyk95GKadohj7hn4mZzecYlgA
-ppxmwlu4r/YVONTZ9m57o1qSc5ajBvati/GLv60zAkFZk27M9B3u/dz+C0ULoK4+
-Mh6hFlDWNmIslSDpIsIPoQe1Xp/kC8pS+d55Ljp16dtu0H5R5uwaPoh9Bqez7ivT
-1g==
+MIICDTCCAW6gAwIBAgISLPTKlhoJwrkhUXUMNRE2OOphMAoGCCqGSM49BAMEMBIx
+EDAOBgNVBAoMB0FjbWUgQ28wHhcNMjAwOTI4MTQxMzI1WhcNMjEwOTI4MTQxMzI1
+WjASMRAwDgYDVQQKDAdBY21lIENvMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQA
+jenFySKNXjgvd98CUs6oHigD8ek/tLmBOlashRT7ZLEUlT9txMoMs+TVwQLzu9b5
+QJghcDJgaXIwAZKbQbEAUecAgitDPH2bfKIdtTIg+9ExbgGgMqwtp/n4Yhkyb2c6
+raqeO8ev1qDYncjPESpDwpn3mK+YdiuHdWyd+KwjtzeimKujYTBfMA4GA1UdDwEB
+/wQEAwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHREEFjAUgglsb2NhbGhvc3SBB2FAYS5jb20wCgYIKoZIzj0E
+AwQDgYwAMIGIAkIB4N12AAjfio5YFJuhok9vmj2OB2glhaUnY2GZNZKhuD67gbun
+k5gLzVYalx/axMwl+Mjk4K/plFoieFvxPzzB/loCQgHqy/kxTyqECSB2wGgvxWAp
+bogruCLdxOkJURRKDpTBWLzBc/Wr/cLb/gAG0T1BygFVTmSMi8ogYNr4d+Bls28B
+qg==
 -----END CERTIFICATE-----
diff --git a/oci/layout/fixtures/accepted_certs/cert.cert b/oci/layout/fixtures/accepted_certs/cert.cert
index 209b65ed18..c0f97b18ec 100644
--- a/oci/layout/fixtures/accepted_certs/cert.cert
+++ b/oci/layout/fixtures/accepted_certs/cert.cert
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICDTCCAW+gAwIBAgITAMl3oYcdOUmREbQgdp8bH1lh4TAKBggqhkjOPQQDBDAS
-MRAwDgYDVQQKDAdBY21lIENvMB4XDTE4MDkyNTIxMjkwOFoXDTE5MDkyNTIxMjkw
-OFowEjEQMA4GA1UECgwHQWNtZSBDbzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
-AI3pxckijV44L3ffAlLOqB4oA/HpP7S5gTpWrIUU+2SxFJU/bcTKDLPk1cEC87vW
-+UCYIXAyYGlyMAGSm0GxAFHnAIIrQzx9m3yiHbUyIPvRMW4BoDKsLaf5+GIZMm9n
-Oq2qnjvHr9ag2J3IzxEqQ8KZ95ivmHYrh3VsnfisI7c3opiro2EwXzAOBgNVHQ8B
-Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0RBBYwFIIJbG9jYWxob3N0gQdhQGEuY29tMAoGCCqGSM49
-BAMEA4GLADCBhwJCAIjq1eQF+Sn2Z46AVA5qfn4Eyk95GKadohj7hn4mZzecYlgA
-ppxmwlu4r/YVONTZ9m57o1qSc5ajBvati/GLv60zAkFZk27M9B3u/dz+C0ULoK4+
-Mh6hFlDWNmIslSDpIsIPoQe1Xp/kC8pS+d55Ljp16dtu0H5R5uwaPoh9Bqez7ivT
-1g==
+MIICDTCCAW6gAwIBAgISLPTKlhoJwrkhUXUMNRE2OOphMAoGCCqGSM49BAMEMBIx
+EDAOBgNVBAoMB0FjbWUgQ28wHhcNMjAwOTI4MTQxMzI1WhcNMjEwOTI4MTQxMzI1
+WjASMRAwDgYDVQQKDAdBY21lIENvMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQA
+jenFySKNXjgvd98CUs6oHigD8ek/tLmBOlashRT7ZLEUlT9txMoMs+TVwQLzu9b5
+QJghcDJgaXIwAZKbQbEAUecAgitDPH2bfKIdtTIg+9ExbgGgMqwtp/n4Yhkyb2c6
+raqeO8ev1qDYncjPESpDwpn3mK+YdiuHdWyd+KwjtzeimKujYTBfMA4GA1UdDwEB
+/wQEAwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHREEFjAUgglsb2NhbGhvc3SBB2FAYS5jb20wCgYIKoZIzj0E
+AwQDgYwAMIGIAkIB4N12AAjfio5YFJuhok9vmj2OB2glhaUnY2GZNZKhuD67gbun
+k5gLzVYalx/axMwl+Mjk4K/plFoieFvxPzzB/loCQgHqy/kxTyqECSB2wGgvxWAp
+bogruCLdxOkJURRKDpTBWLzBc/Wr/cLb/gAG0T1BygFVTmSMi8ogYNr4d+Bls28B
+qg==
 -----END CERTIFICATE-----
diff --git a/vendor.conf b/vendor.conf
index 246c0096a3..585ec31100 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -1,7 +1,7 @@
 github.com/containers/image
 
 github.com/sirupsen/logrus v1.0.0
-github.com/containers/storage master
+github.com/containers/storage b8e0174ae6b2dc083d9ada365b9a207371aa62a6
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
 github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
@@ -34,7 +34,7 @@ github.com/xeipuuv/gojsonschema master
 github.com/xeipuuv/gojsonreference master
 github.com/xeipuuv/gojsonpointer master
 github.com/tchap/go-patricia v2.2.6
-github.com/opencontainers/selinux ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d
+github.com/opencontainers/selinux 36a9bc45a08c85f2c52bd9eb32e20267876773bd
 github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0
 github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460
 github.com/gogo/protobuf fcdc5011193ff531a548e9b0301828d5a5b97fd8