diff --git a/CHANGELOG.md b/CHANGELOG.md
index 080ac6a..4fb44cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 ## Unreleased
 
 
+## Release 0.131
+
+#### Added
+- AVIF support in GD for PHP 8.1 (#834)[https://github.com/cytopia/devilbox/issues/834]
+
+
 ## Release 0.130
 
 #### Fixed
diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1
index 262d554..ba21ff9 100644
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -12,6 +12,7 @@ RUN set -eux \
 		alien \
 		firebird-dev \
 		libaio-dev \
+		libavif-dev \
 		libbz2-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
@@ -128,7 +129,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
-	&& docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype \
+	&& docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --with-avif \
 	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
 	&& true
@@ -625,6 +626,7 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
+	libavif9 \
 	libc-client2007e \
 	libenchant-2-2 \
 	libfbclient2 \
diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
index ad0d5ae..065da1a 100644
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -331,7 +331,9 @@ extensions_available:
       configure: --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype
     8.1:
       type: builtin
-      configure: --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype
+      configure: --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --with-avif
+      build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev, libavif-dev]
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx6, libfreetype6, libwebp6, libavif9]
     all:
       type: builtin
       pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/
diff --git a/tests/mods/modules/gd/gd-avif.php b/tests/mods/modules/gd/gd-avif.php
new file mode 100644
index 0000000..44ac39b
--- /dev/null
+++ b/tests/mods/modules/gd/gd-avif.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * This page should print 'OK' if everything works,
+ * 'FAIL' or nothing if an error occured.
+ */
+ini_set('display_startup_errors', 1);
+ini_set('display_errors', 1);
+error_reporting(-1);
+
+
+// Only available since PHP 8.1.x
+if (version_compare($PHP_VERSION, '8.1.0', '<=')) {
+	echo 'SKIP';
+	exit(0);
+}
+
+// Check for support
+if (!function_exists('imageavif')) {
+	echo 'FAIL: imageavif()';
+	exit(1);
+}
+
+echo 'OK';