diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml
index 53b1ba9c73..c9b3be8555 100644
--- a/deployment/database/mysql-container-puppet.yaml
+++ b/deployment/database/mysql-container-puppet.yaml
@@ -268,8 +268,7 @@ outputs:
                 str_replace:
                   # Use a Jinja template below to force str_replace
                   # to quote the resulting string
-                  # TODO: remove the grep filter once #1811384 is fixed
-                  template: &mysql_template '{{ "paunch" }} list --default-runtime RUNTIME -f json -c container -c image | grep -v "isn''t supported by" | jq -r ''.[] | select(.container=="mysql") + {"cli":"RUNTIME"}'''
+                  template: &mysql_template '{{ "paunch" }} list --default-runtime RUNTIME -f json -c container -c image | jq -r ''.[] | select(.container=="mysql") + {"cli":"RUNTIME"}'''
                   params:
                     RUNTIME: "{{ container_cli }}"
               register: mysql_paunch