diff --git a/source/manual/proxy.rst b/source/manual/proxy.rst
index 1003fec9..ac3222dd 100644
--- a/source/manual/proxy.rst
+++ b/source/manual/proxy.rst
@@ -143,24 +143,18 @@ There are some rules to take into account when creating custom themed error page
 -----------------------
 Configuration / How-tos
 -----------------------
-More information on how to utilize OPNsense's proxy service can be found in:
-
-Proxy Basic Setup
------------------
-:doc:`how-tos/cachingproxy`
 
-Setup Web Filtering
--------------------
-:doc:`how-tos/proxywebfilter`
+More information on how to utilize OPNsense's proxy service can be found in:
 
-Setup Transparent Mode (including SSL)
---------------------------------------
-:doc:`how-tos/proxytransparent`
 
-Setup WPAD/PAC
---------------
-:doc:`how-tos/pac`
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
 
-Setup ICAP Anti Virus/Malware Engine
-------------------------------------
-:doc:`how-tos/proxyicapantivirus`
+   /manual/how-tos/cachingproxy
+   /manual/how-tos/guestnet
+   /manual/how-tos/pac
+   /manual/how-tos/proxyicapantivirus
+   /manual/how-tos/proxyicapantivirusinternal
+   /manual/how-tos/proxytransparent
+   /manual/how-tos/proxywebfilter
diff --git a/source/plugins.rst b/source/plugins.rst
index fb51b192..25db36f6 100644
--- a/source/plugins.rst
+++ b/source/plugins.rst
@@ -71,6 +71,7 @@ Other
    :maxdepth: 2
    :titlesonly:
 
+   manual/proxy
    manual/how-tos/freeradius
    manual/how-tos/accounting
    manual/how-tos/mailgateway
diff --git a/source/services.rst b/source/services.rst
index dcb61e59..1304cce2 100644
--- a/source/services.rst
+++ b/source/services.rst
@@ -23,7 +23,6 @@ Your security appliance comes with quite some services to ease network operation
    manual/ntpd
    manual/opendns
    manual/unbound
-   manual/proxy
    manual/radvd
    manual/logging_services
 
@@ -36,10 +35,4 @@ Setup guides
    :maxdepth: 2
    :titlesonly:
 
-   manual/how-tos/pac
-   manual/how-tos/proxyicapantivirus
-   manual/how-tos/proxyicapantivirusinternal
-   manual/how-tos/proxytransparent
-   manual/how-tos/proxywebfilter
    manual/how-tos/guestnet
-   manual/how-tos/cachingproxy