diff --git a/PKGBUILD b/PKGBUILD
index c0ff7ef..71cf582 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,56 @@
-# Maintainer: Tony Lambiris <tony@criticalstack.com>
+# Maintainer: Nobody, that's why did this

 pkgname=cri-o
-pkgver=1.14.6
+pkgver=1.16.0
 pkgrel=1
 pkgdesc='Open Container Initiative-based implementation of Kubernetes Container Runtime Interface'
 arch=(x86_64)
-url='https://github.com/kubernetes-sigs/cri-o'
+url='https://github.com/cri-o/cri-o'
 license=(Apache)
 makedepends=(go go-md2man ostree)
+depends=(conmon)
 backup=('etc/crio/crio.conf')
-source=("git+https://github.com/kubernetes-sigs/cri-o")
+source=("git+https://github.com/cri-o/cri-o#tag=v${pkgver}")
 sha256sums=('SKIP')

 prepare() {
-       cd "$srcdir/$pkgname"
+       cd "${srcdir}/${pkgname}"

-       git checkout "v$pkgver"
-       install -m755 -d "$srcdir/go/src/github.com/kubernetes-sigs"
+       install -m755 -d "${srcdir}/go/src/github.com/cri-o"

-       ln -sf "$srcdir/$pkgname" "$srcdir/go/src/github.com/kubernetes-sigs/cri-o"
+       ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/cri-o/cri-o"
 }

 build() {
-       cd "$srcdir/go/src/github.com/kubernetes-sigs/cri-o"
+       cd "$srcdir/go/src/github.com/cri-o/cri-o"

-       sed -i 's/$(GO) build -i/$(GO) build/' Makefile
-       sed -i 's#../bin/conmon: config.h $(obj) | ../bin#../bin/conmon: $(obj) | config.h ../bin#' conmon/Makefile
+       sed -i 's/$(GO) build -i/$(GO) build/' Makefile


-       export GOPATH="${srcdir}/go" PATH="${srcdir}/go/bin:${PATH}"
:
+depends=(conmon)
 backup=('etc/crio/crio.conf')
-source=("git+https://github.com/kubernetes-sigs/cri-o")
+source=("git+https://github.com/cri-o/cri-o#tag=v${pkgver}")
 sha256sums=('SKIP')

 prepare() {
-       cd "$srcdir/$pkgname"
+       cd "${srcdir}/${pkgname}"

-       git checkout "v$pkgver"
-       install -m755 -d "$srcdir/go/src/github.com/kubernetes-sigs"
+       install -m755 -d "${srcdir}/go/src/github.com/cri-o"

-       ln -sf "$srcdir/$pkgname" "$srcdir/go/src/github.com/kubernetes-sigs/cri-o"
+       ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/cri-o/cri-o"
 }

 build() {
-       cd "$srcdir/go/src/github.com/kubernetes-sigs/cri-o"
+       cd "$srcdir/go/src/github.com/cri-o/cri-o"

-       sed -i 's/$(GO) build -i/$(GO) build/' Makefile
-       sed -i 's#../bin/conmon: config.h $(obj) | ../bin#../bin/conmon: $(obj) | config.h ../bin#' conmon/Makefile
+       sed -i 's/$(GO) build -i/$(GO) build/' Makefile


-       export GOPATH="${srcdir}/go" PATH="${srcdir}/go/bin:${PATH}"
+       export GOPATH="${srcdir}/go" PATH="${srcdir}/go/bin:${PATH}"

-       make install.tools
-       make
+       make -j 6

-       ./bin/crio --selinux=true \
-               --storage-driver=overlay \
-               --conmon /usr/libexec/crio/conmon \
-               --cni-plugin-dir /usr/libexec/cni \
-               --cgroup-manager=systemd config > crio.conf
+       ./bin/crio --selinux=false \
+               --storage-driver=btrfs \
+               --conmon /usr/bin/conmon \
+               --cni-plugin-dir /opt/cni/bin \
+               --cgroup-manager=systemd config > cri-o.conf
 }

 package() {
-       cd "${srcdir}/go/src/github.com/kubernetes-sigs/cri-o"
+       cd "${srcdir}/go/src/github.com/cri-o/cri-o"

-       export GOPATH="${srcdir}/go"
-       make install install.systemd PREFIX="${pkgdir}/usr"
+       export GOPATH="${srcdir}/go"
+       make install install.systemd PREFIX="${pkgdir}/usr"

-       install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+       install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

-       # fix-up paths pointing to /usr/local to /usr
-       sed -i --follow-symlinks -re 's|/usr/local|/usr|g' "${pkgdir}/usr/lib/systemd/system/"*.service
+       # fix-up paths pointing to /usr/local to /usr
+       sed -i --follow-symlinks -re 's|/usr/local|/usr|g' "${pkgdir}/usr/lib/systemd/system/"*.service

-       # install configs
-       install -dm755 "${pkgdir}/etc/crio/"
-       install -Dm644 "crio.conf" "${pkgdir}/etc/crio/crio.conf"
-       install -Dm644 "seccomp.json" "${pkgdir}/etc/crio/seccomp.json"
+       # install configs
+       install -dm755 "${pkgdir}/etc/cri-o/"
+       install -Dm644 crio.conf "${pkgdir}/etc/crio/crio.conf"
+       install -Dm644 vendor/github.com/seccomp/containers-golang/seccomp.json "${pkgdir}/etc/crio/seccomp.json"
 }