diff --git a/.gitignore b/.gitignore
index b12e08e6..14596be8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ cmd/proto-rootgen/proto-rootgen
 .*-test
 examples/**/example.log
 examples/getting-started/config/new-config.yaml
+*.pdf
diff --git a/README.md b/README.md
index ded6bf84..b357fa64 100644
--- a/README.md
+++ b/README.md
@@ -343,5 +343,5 @@ Development
 [vfio]: https://www.kernel.org/doc/Documentation/vfio.txt
 [dpdk-linux-drivers]: https://doc.dpdk.org/guides/linux_gsg/linux_drivers.html
 [hugepages]: https://wiki.debian.org/Hugepages
-[vpp-hugepages]: https://fd.io/docs/vpp/master/gettingstarted/users/configuring/hugepages.html
+[vpp-hugepages]: https://s3-docs.fd.io/vpp/21.10.1/gettingstarted/users/configuring/hugepages.html
 [gns3-vm-docs]: docs/GNS3_APPLIANCES.md
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 8b9d83d1..79330d28 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -57,7 +57,7 @@ as well as during run-time when a (CNF) configuration change is requested:
 [ligato-vpp-agent]: https://github.com/ligato/vpp-agent
 [stonework-diagram]: img/stonework.png
 [control-flow-diagram]: img/control-flow.png
-[punt-manager-plugin]: plugins/puntmgr/README.md
-[cnf-registry-plugin]: plugins/cnfreg/README.md
+[punt-manager-plugin]: ../plugins/puntmgr/README.md
+[cnf-registry-plugin]: ../plugins/cnfreg/README.md
 
 
diff --git a/docs/USERGUIDE.md b/docs/USERGUIDE.md
index 6d34d924..1923df79 100644
--- a/docs/USERGUIDE.md
+++ b/docs/USERGUIDE.md
@@ -537,7 +537,7 @@ So the `cnf-bgp` introduces new root level entry called bgpConfig, to describe i
 [agentctl-link]: https://docs.ligato.io/en/latest/user-guide/agentctl/
 [ligato-link]: https://ligato.io/
 [conf-model]: config/STONEWORK-CONFIG.md
-[vpp-cli-guide]: https://wiki.fd.io/view/VPP/Command-line_Interface_(CLI)_Guide
+[vpp-cli-guide]: https://s3-docs.fd.io/vpp/22.06/cli-reference/gettingstarted/index.html
 [tap-example]: ../examples/getting-started/README.md
 [dpdk]: https://www.dpdk.org/
 [readme]: ../README.md
diff --git a/docs/config/STONEWORK-CONFIG.md b/docs/config/STONEWORK-CONFIG.md
index 9ad7bf48..1c01082e 100644
--- a/docs/config/STONEWORK-CONFIG.md
+++ b/docs/config/STONEWORK-CONFIG.md
@@ -3338,7 +3338,7 @@ MemifLink defines configuration for interface type: MEMIF
 <a name="ligato.vpp.interfaces.RDMALink"></a>
 
 ### RDMALink
-https://github.com/FDio/vpp/blob/master/src/plugins/rdma/rdma_doc.md
+https://github.com/FDio/vpp/blob/master/src/plugins/rdma/rdma_doc.rst
 
 
 | Field                | Type                | Label     | Description                                      |