diff --git a/waydroid-image/.SRCINFO b/waydroid-image/.SRCINFO
new file mode 100644
index 0000000..c48b6f1
--- /dev/null
+++ b/waydroid-image/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = waydroid-image
+	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system (Android image)
+	pkgver = 17.1_20211021
+	pkgrel = 1
+	url = https://github.com/waydroid
+	arch = x86_64
+	arch = i686
+	arch = armv7h
+	arch = aarch64
+	license = Apache
+	depends = waydroid
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-17.1-20211021-VANILLA-waydroid_x86_64-system.zip
+	source_x86_64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-17.1-20211021-MAINLINE-waydroid_x86_64-vendor.zip
+	sha256sums_x86_64 = c56225255380e1707a0380555e1d55961a5bc5e670b2b769724b52ae40283d84
+	sha256sums_x86_64 = 99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-17.1-20211021-VANILLA-waydroid_x86-system.zip
+	source_i686 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-17.1-20211021-MAINLINE-waydroid_x86-vendor.zip
+	sha256sums_i686 = 76e0e609b1204ec09eed663fe21250ad07550e09b48af381ed3b30f7d69e4d26
+	sha256sums_i686 = b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-17.1-20211021-VANILLA-waydroid_arm-system.zip
+	source_armv7h = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-17.1-20211021-MAINLINE-waydroid_arm-vendor.zip
+	sha256sums_armv7h = 4e6fba3a7e1f010c131caf507c04f8c8090672c919519273560274005fc6d30b
+	sha256sums_armv7h = 6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-17.1-20211021-VANILLA-waydroid_arm64-system.zip
+	source_aarch64 = https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-17.1-20211021-MAINLINE-waydroid_arm64-vendor.zip
+	sha256sums_aarch64 = ea5af33272e9761016d3f36fe7a414ac22b16f70214f5b4839ff75b806a77819
+	sha256sums_aarch64 = e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84
+
+pkgname = waydroid-image
diff --git a/waydroid-image/.gitrepo b/waydroid-image/.gitrepo
new file mode 100644
index 0000000..5be2d11
--- /dev/null
+++ b/waydroid-image/.gitrepo
@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://aur.archlinux.org/waydroid-image.git
+	branch = master
+	commit = 103017cec3153f97151fb6c7df445fd46d84bfe0
+	parent = 99951ee7bd5f5094473331f810a8cbbffb941bd0
+	method = merge
+	cmdver = 0.4.3
diff --git a/waydroid-image/PKGBUILD b/waydroid-image/PKGBUILD
new file mode 100644
index 0000000..6b81920
--- /dev/null
+++ b/waydroid-image/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Danct12 <danct12@disroot.org>
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+
+_pkgver_images_system="17.1-20211021"
+_pkgver_images_vendor="17.1-20211021"
+pkgname=waydroid-image
+pkgver="${_pkgver_images_system//-/_}"
+pkgrel=1
+pkgdesc="A container-based approach to boot a full Android system on a regular Linux system (Android image)"
+arch=('x86_64' 'i686' 'armv7h' 'aarch64')
+license=('Apache')
+url='https://github.com/waydroid'
+depends=('waydroid')
+source_i686=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver_images_system-VANILLA-waydroid_x86-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip)
+source_x86_64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver_images_system-VANILLA-waydroid_x86_64-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip)
+source_armv7h=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver_images_system-VANILLA-waydroid_arm-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip)
+source_aarch64=(https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver_images_system-VANILLA-waydroid_arm64-system.zip
+  https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip)
+
+case "$CARCH" in
+  aarch64) _imgarch="arm64" ;;
+  armv7h) _imgarch="arm" ;;
+  *) _imgarch="$CARCH" ;;
+esac
+
+package() {
+  install -dm755 "$pkgdir/usr/share/waydroid-extra/images"
+
+  # makepkg have extracted the zips
+  mv "$srcdir/system.img" "$pkgdir/usr/share/waydroid-extra/images"
+  mv "$srcdir/vendor.img" "$pkgdir/usr/share/waydroid-extra/images"
+}
+
+sha256sums_x86_64=('c56225255380e1707a0380555e1d55961a5bc5e670b2b769724b52ae40283d84'
+                   '99512ed7bcc1190ead02447ba9a716f50eeb64a87135ce15a030475e119464f1')
+sha256sums_i686=('76e0e609b1204ec09eed663fe21250ad07550e09b48af381ed3b30f7d69e4d26'
+                 'b6a946f7dc81f43a06398179080462623dc348ca2484467571b13b35130be4f9')
+sha256sums_armv7h=('4e6fba3a7e1f010c131caf507c04f8c8090672c919519273560274005fc6d30b'
+                   '6a743926d80325a5f386472386e848e8948e2f48ead0a3875cb4702b80c561ba')
+sha256sums_aarch64=('ea5af33272e9761016d3f36fe7a414ac22b16f70214f5b4839ff75b806a77819'
+                    'e4f98d0b7702ccee1caeb8757a9fdc9e7473ff0053dc8326d9b4da72699a5f84')