diff --git a/plugins/vsTAAmbk/skip-opencl-test.diff b/plugins/vsTAAmbk/0001-Skip-OpenCL-test.patch
similarity index 65%
rename from plugins/vsTAAmbk/skip-opencl-test.diff
rename to plugins/vsTAAmbk/0001-Skip-OpenCL-test.patch
index f9ec34f..464bc2c 100644
--- a/plugins/vsTAAmbk/skip-opencl-test.diff
+++ b/plugins/vsTAAmbk/0001-Skip-OpenCL-test.patch
@@ -1,3 +1,12 @@
+From 35b84e26e337a3d8a3cacc5dcfde8d8c81931924 Mon Sep 17 00:00:00 2001
+From: Simon Bruder <simon@sbruder.de>
+Date: Fri, 15 Oct 2021 19:34:45 +0200
+Subject: [PATCH 1/2] Skip OpenCL test
+
+---
+ test/vsTAAmbkTestCase.py | 1 +
+ 1 file changed, 1 insertion(+)
+
 diff --git a/test/vsTAAmbkTestCase.py b/test/vsTAAmbkTestCase.py
 index ca85b73..7a70a00 100644
 --- a/test/vsTAAmbkTestCase.py
@@ -10,3 +19,6 @@ index ca85b73..7a70a00 100644
      def test_opencl(self):
          test_clip = [self.gray8, self.gray16]
          for clip in test_clip:
+-- 
+2.31.1
+
diff --git a/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch b/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch
new file mode 100644
index 0000000..f09b046
--- /dev/null
+++ b/plugins/vsTAAmbk/0002-Use-format-IDs-from-VapourSynth-R55.patch
@@ -0,0 +1,35 @@
+From cfc284a25d94ddf4459bac612d208f9065ccebcf Mon Sep 17 00:00:00 2001
+From: Simon Bruder <simon@sbruder.de>
+Date: Fri, 15 Oct 2021 19:32:44 +0200
+Subject: [PATCH 2/2] Use format IDs from VapourSynth R55
+
+---
+ test/vsTAAmbkTestCase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/vsTAAmbkTestCase.py b/test/vsTAAmbkTestCase.py
+index 7a70a00..d2acdd6 100644
+--- a/test/vsTAAmbkTestCase.py
++++ b/test/vsTAAmbkTestCase.py
+@@ -88,12 +88,12 @@ class GeneralTestCase(unittest.TestCase):
+     yuv420p16 = core.std.BlankClip(width=1920, height=1080, format=vs.YUV420P16, fpsnum=24000, fpsden=1001)
+     yuv444p16 = core.std.BlankClip(width=1920, height=1080, format=vs.YUV444P16, fpsnum=24000, fpsden=1001)
+     format_id = {
+-        '1000010': 'GRAY8',
+-        '1000011': 'GRAY16',
+-        '3000010': 'YUV420P8',
+-        '3000012': 'YUV444P8',
+-        '3000022': 'YUV420P16',
+-        '3000024': 'YUV444P16',
++        '268959744': 'GRAY8',
++        '269484032': 'GRAY16',
++        '805830913': 'YUV420P8',
++        '805830656': 'YUV444P8',
++        '806355201': 'YUV420P16',
++        '806354944': 'YUV444P16',
+     }
+ 
+     def test_default_value(self):
+-- 
+2.31.1
+
diff --git a/plugins/vsTAAmbk/default.nix b/plugins/vsTAAmbk/default.nix
index b7d6116..46fe8ce 100644
--- a/plugins/vsTAAmbk/default.nix
+++ b/plugins/vsTAAmbk/default.nix
@@ -12,7 +12,8 @@ buildPythonPackage rec {
   };
 
   patches = [
-    ./skip-opencl-test.diff
+    ./0001-Skip-OpenCL-test.patch
+    ./0002-Use-format-IDs-from-VapourSynth-R55.patch
   ];
 
   propagatedBuildInputs = with vapoursynthPlugins; [
@@ -27,6 +28,7 @@ buildPythonPackage rec {
     mvtools
     nnedi3
     nnedi3cl
+    removegrain
     sangnom
     tcanny
     znedi3