diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 4fdc11298a..e17c584e3c 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -2061,7 +2061,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <e>apply_overrides</e>
           <e>result_hosts_only</e>
           <e>min_qod</e>
-          <e>autofp</e>
           <any><e>filter</e></any>
           <o><e>delta</e></o>
         </pattern>
@@ -2116,13 +2115,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             text
           </pattern>
         </ele>
-        <ele>
-          <name>autofp</name>
-          <summary>
-            Whether to trust vendor security updates.  1 full match, 2 partial
-          </summary>
-          <pattern>xsd:token { pattern = "0|1|2" }</pattern>
-        </ele>
         <ele>
           <name>filter</name>
           <summary>Level filter</summary>
@@ -14915,18 +14907,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <type>boolean</type>
             <summary>Whether to apply Overrides</summary>
           </option>
-          <option>
-            <name>autofp</name>
-            <type>
-              <alts>
-                <alt>0</alt>
-                <alt>1</alt>
-                <alt>2</alt>
-              </alts>
-            </type>
-            <summary>Whether to trust vendor security updates.
-            1 full match, 2 partial</summary>
-          </option>
           <option>
             <name>levels</name>
             <type>levels</type>
@@ -15000,18 +14980,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <column>
             <name>type</name>
             <type>threat</type>
-            <summary>Severity type of the result with overrides and autofp</summary>
+            <summary>Severity type of the result with overrides</summary>
           </column>
           <column>
             <name>original_type</name>
             <type>threat</type>
             <summary>Original severity type of the result</summary>
           </column>
-          <column>
-            <name>auto_type</name>
-            <type>boolean</type>
-            <summary>Whether autofp applies to the result</summary>
-          </column>
           <column>
             <name>description</name>
             <type>text</type>
@@ -15040,7 +15015,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <column>
             <name>severity</name>
             <type>severity</type>
-            <summary>Severity of the result with overrides and autofp</summary>
+            <summary>Severity of the result with overrides</summary>
           </column>
           <column>
             <name>original_severity</name>
@@ -16316,18 +16291,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <type>boolean</type>
             <summary>Whether to apply Overrides</summary>
           </option>
-          <option>
-            <name>autofp</name>
-            <type>
-              <alts>
-                <alt>0</alt>
-                <alt>1</alt>
-                <alt>2</alt>
-              </alts>
-            </type>
-            <summary>Whether to trust vendor security updates.
-            1 full match, 2 partial</summary>
-          </option>
           <option>
             <name>levels</name>
             <type>levels</type>
@@ -16401,18 +16364,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <column>
             <name>type</name>
             <type>threat</type>
-            <summary>Severity type of the result with overrides and autofp</summary>
+            <summary>Severity type of the result with overrides</summary>
           </column>
           <column>
             <name>original_type</name>
             <type>threat</type>
             <summary>Original severity type of the result</summary>
           </column>
-          <column>
-            <name>auto_type</name>
-            <type>boolean</type>
-            <summary>Whether autofp applies to the result</summary>
-          </column>
           <column>
             <name>description</name>
             <type>text</type>
@@ -16441,7 +16399,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <column>
             <name>severity</name>
             <type>severity</type>
-            <summary>Severity of the result with overrides and autofp</summary>
+            <summary>Severity of the result with overrides</summary>
           </column>
           <column>
             <name>original_severity</name>
@@ -25987,6 +25945,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   <!-- Compatibility changes between versions. -->
 
+  <change>
+    <command>GET_REPORTS, GET_RESULTS</command>
+    <summary>Remove elements AUTOFP and AUTO_TYPE from element FILTERS</summary>
+    <description>
+      <p>
+        The element to specify the autofp value and the related auto_type for a filter is removed.
+      </p>
+    </description>
+    <version>21.4</version>
+  </change>
   <change>
     <command>CREATE_SCANNER, MODIFY_SCANNER, GET_REPORTS</command>
     <summary>GMP scanners have been removed</summary>