diff --git a/Neos.Flow/Classes/Mvc/Routing/UriBuilder.php b/Neos.Flow/Classes/Mvc/Routing/UriBuilder.php
index 8cce500867..ea5ca3551e 100644
--- a/Neos.Flow/Classes/Mvc/Routing/UriBuilder.php
+++ b/Neos.Flow/Classes/Mvc/Routing/UriBuilder.php
@@ -73,11 +73,13 @@ class UriBuilder
 
     /**
      * @var boolean
+     * @deprecated with Flow 9.0
      */
     protected $addQueryString = false;
 
     /**
      * @var array
+     * @deprecated with Flow 9.0
      */
     protected $argumentsToBeExcludedFromQueryString = [];
 
@@ -205,7 +207,7 @@ public function getCreateAbsoluteUri()
      *
      * @param boolean $addQueryString
      * @return UriBuilder the current UriBuilder to allow method chaining
-     * @api
+     * @deprecated with Flow 9.0
      */
     public function setAddQueryString($addQueryString)
     {
@@ -215,7 +217,7 @@ public function setAddQueryString($addQueryString)
 
     /**
      * @return boolean
-     * @api
+     * @deprecated with Flow 9.0
      */
     public function getAddQueryString()
     {
@@ -228,7 +230,7 @@ public function getAddQueryString()
      *
      * @param array $argumentsToBeExcludedFromQueryString
      * @return UriBuilder the current UriBuilder to allow method chaining
-     * @api
+     * @deprecated with Flow 9.0
      */
     public function setArgumentsToBeExcludedFromQueryString(array $argumentsToBeExcludedFromQueryString)
     {
@@ -238,7 +240,7 @@ public function setArgumentsToBeExcludedFromQueryString(array $argumentsToBeExcl
 
     /**
      * @return array
-     * @api
+     * @deprecated with Flow 9.0
      */
     public function getArgumentsToBeExcludedFromQueryString()
     {
diff --git a/Neos.FluidAdaptor/Classes/ViewHelpers/FormViewHelper.php b/Neos.FluidAdaptor/Classes/ViewHelpers/FormViewHelper.php
index 6fa3cbca2d..9d627d6dcf 100644
--- a/Neos.FluidAdaptor/Classes/ViewHelpers/FormViewHelper.php
+++ b/Neos.FluidAdaptor/Classes/ViewHelpers/FormViewHelper.php
@@ -118,12 +118,13 @@ public function initializeArguments()
         $this->registerArgument('format', 'string', 'The requested format, e.g. ".html"', false, '');
         $this->registerArgument('additionalParams', 'array', 'additional query parameters that won\'t be prefixed like $arguments (overrule $arguments)', false, []);
         $this->registerArgument('absolute', 'boolean', 'If set, an absolute action URI is rendered (only active if $actionUri is not set)', false, false);
-        $this->registerArgument('addQueryString', 'boolean', 'If set, the current query parameters will be kept in the URI', false, false);
-        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
         $this->registerArgument('fieldNamePrefix', 'string', 'Prefix that will be added to all field names within this form', false, null);
         $this->registerArgument('actionUri', 'string', 'can be used to overwrite the "action" attribute of the form tag', false, null);
         $this->registerArgument('objectName', 'string', 'name of the object that is bound to this form. If this argument is not specified, the name attribute of this form is used to determine the FormObjectName', false, null);
         $this->registerArgument('useParentRequest', 'boolean', 'If set, the parent Request will be used instead ob the current one', false, false);
+        // @deprecated with Flow 9:
+        $this->registerArgument('addQueryString', 'boolean', 'Deprecated with Flow 9. If set, the current query parameters will be kept in the URI', false, false);
+        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'Deprecated with Flow 9. arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
 
         $this->registerUniversalTagAttributes();
     }
diff --git a/Neos.FluidAdaptor/Classes/ViewHelpers/Link/ActionViewHelper.php b/Neos.FluidAdaptor/Classes/ViewHelpers/Link/ActionViewHelper.php
index b0599fb374..42055ad4cf 100644
--- a/Neos.FluidAdaptor/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/Neos.FluidAdaptor/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -66,11 +66,12 @@ public function initializeArguments()
         $this->registerArgument('section', 'string', 'The anchor to be added to the URI', false, '');
         $this->registerArgument('format', 'string', 'The requested format, e.g. ".html"', false, '');
         $this->registerArgument('additionalParams', 'array', 'additional query parameters that won\'t be prefixed like $arguments (overrule $arguments)', false, []);
-        $this->registerArgument('addQueryString', 'boolean', 'If set, the current query parameters will be kept in the URI', false, false);
-        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
         $this->registerArgument('useParentRequest', 'boolean', 'If set, the parent Request will be used instead of the current one. Note: using this argument can be a sign of undesired tight coupling, use with care', false, false);
         $this->registerArgument('absolute', 'boolean', 'By default this ViewHelper renders links with absolute URIs. If this is false, a relative URI is created instead', false, true);
         $this->registerArgument('useMainRequest', 'boolean', 'If set, the main Request will be used instead of the current one. Note: using this argument can be a sign of undesired tight coupling, use with care', false, false);
+        // @deprecated with Flow 9:
+        $this->registerArgument('addQueryString', 'boolean', 'Deprecated with Flow 9. If set, the current query parameters will be kept in the URI', false, false);
+        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'Deprecated with Flow 9. arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
     }
 
     /**
diff --git a/Neos.FluidAdaptor/Classes/ViewHelpers/Uri/ActionViewHelper.php b/Neos.FluidAdaptor/Classes/ViewHelpers/Uri/ActionViewHelper.php
index be620ec7e6..546e1a9a1c 100644
--- a/Neos.FluidAdaptor/Classes/ViewHelpers/Uri/ActionViewHelper.php
+++ b/Neos.FluidAdaptor/Classes/ViewHelpers/Uri/ActionViewHelper.php
@@ -57,10 +57,11 @@ public function initializeArguments()
         $this->registerArgument('format', 'string', 'The requested format, e.g. ".html"', false, '');
         $this->registerArgument('additionalParams', 'array', 'additional query parameters that won\'t be prefixed like $arguments (overrule $arguments)', false, []);
         $this->registerArgument('absolute', 'boolean', 'By default this ViewHelper renders links with absolute URIs. If this is false, a relative URI is created instead', false, false);
-        $this->registerArgument('addQueryString', 'boolean', 'If set, the current query parameters will be kept in the URI', false, false);
-        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
         $this->registerArgument('useParentRequest', 'boolean', 'If set, the parent Request will be used instead of the current one. Note: using this argument can be a sign of undesired tight coupling, use with care', false, false);
         $this->registerArgument('useMainRequest', 'boolean', 'If set, the main Request will be used instead of the current one. Note: using this argument can be a sign of undesired tight coupling, use with care', false, false);
+        // @deprecated with Flow 9:
+        $this->registerArgument('addQueryString', 'boolean', 'Deprecated with Flow 9. If set, the current query parameters will be kept in the URI', false, false);
+        $this->registerArgument('argumentsToBeExcludedFromQueryString', 'array', 'Deprecated with Flow 9. arguments to be removed from the URI. Only active if $addQueryString = true', false, []);
     }
 
     /**