diff --git a/content/designs/application-bundle-metadata.md b/content/designs/application-bundle-metadata.md
index bdfc769ecf7f9852cb825aa5f5c54b795c1ffcc6..28a67d804efccfa62c9acf3a94ed674b0829f6f5 100644
--- a/content/designs/application-bundle-metadata.md
+++ b/content/designs/application-bundle-metadata.md
@@ -566,7 +566,7 @@ requester's AppArmor label (part of the AppArmor context).
[D-Bus names]: https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names
[Deprecated AppStream path]: https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
[Desktop Entry Specification]: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
-[Entry points]: https://wiki.apertis.org/Application_Entry_Points
+[Entry points]: {{< ref "application-entry-points.md" >}}
[Flatpak]: http://flatpak.org/
[freedesktop.org Icon Theme Specification]: http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
[GetConnectionCredentials]: https://dbus.freedesktop.org/doc/dbus-specification.html#bus-messages-get-connection-credentials
diff --git a/content/designs/application-entry-points.md b/content/designs/application-entry-points.md
index deb9f656f86b88964895093c1f6e3785f9ec03a8..466df019188e8bd57eeb36f59d04e3d72cff3523 100644
--- a/content/designs/application-entry-points.md
+++ b/content/designs/application-entry-points.md
@@ -751,7 +751,6 @@ Exec=/usr/Applications/org.apertis.Frampton/bin/frampton-control --shuffle-all
[Apertis Application Bundle Specification]: https://appdev.apertis.org/documentation/bundle-spec.html
[Applications design document]: applications.md
-[Application Entry Points]: https://wiki.apertis.org/Application_Entry_Points
[Application bundle metadata]: application-bundle-metadata.md
[App store approval]: {{< ref "app_store_approval.md" >}}
[Multimedia design]: multimedia.md
diff --git a/content/designs/application-layout.md b/content/designs/application-layout.md
index d555db9c73e5b78302715f2f38f4befbe8f3df46..a2a982f2e86de0acd4f44cffd4eff9ca2ef32d34 100644
--- a/content/designs/application-layout.md
+++ b/content/designs/application-layout.md
@@ -1309,7 +1309,7 @@ writing, no implementations of this idea are known.
[Apertis Application Bundle Specification]: https://appdev.apertis.org/documentation/bundle-spec.html
[Applications design]: applications.md
[Applications design document]: applications.md
-[Application Entry Points]: https://wiki.apertis.org/Application_Entry_Points
+[Application Entry Points]: {{< ref "application-entry-points.md" >}}
[App store approval]: {{< ref "app_store_approval.md" >}}
[Interface discovery]: {{< ref "interface_discovery.md" >}}
[Multimedia design]: multimedia.md
diff --git a/content/designs/audio-management.md b/content/designs/audio-management.md
index 033e64422826810f37515f0f179fe53bfec65eb4..40e882799394477fbd139b362e5b4e600c2e2279 100644
--- a/content/designs/audio-management.md
+++ b/content/designs/audio-management.md
@@ -709,4 +709,4 @@ This design fullfill the following requirements:
[Application bundle metadata]: {{< ref "application-bundle-metadata.md" >}}
[Multimedia]: {{< ref "multimedia.md" >}}
[GENIVI audio manager]: http://docs.projects.genivi.org/AudioManager/
-[mute hard-key]: https://wiki.apertis.org/HardKeys
+[mute hard-key]: {{< ref "hardkeys.md" >}}
diff --git a/content/designs/coding_conventions.md b/content/designs/coding_conventions.md
index 9b3c1141d532e4aea5dd96fd2620fe6702dc5cc7..cc1b37253a884093c08989e05415cb7defdcb58b 100644
--- a/content/designs/coding_conventions.md
+++ b/content/designs/coding_conventions.md
@@ -98,7 +98,7 @@ xargs clang-format -i -style=file
Using a `.clang-format` file (added to git) in the same directory, containing:
```
-# See https://designs.apertis.org/latest/coding_conventions.html#code-formatting
+# See [Code formatting]( {{< ref "coding_conventions.md#code-formatting" >}} )
BasedOnStyle: GNU
AlwaysBreakAfterDefinitionReturnType: All
BreakBeforeBinaryOperators: None
diff --git a/content/designs/geolocation-and-navigation.md b/content/designs/geolocation-and-navigation.md
index 263343e74c3c8b3b0bbd4487706db229903d04a8..0dfb4a59e555367e2676ae39fd40d0e44330015b 100644
--- a/content/designs/geolocation-and-navigation.md
+++ b/content/designs/geolocation-and-navigation.md
@@ -2542,7 +2542,7 @@ string, followed by it split up into its un-encoded components.
- Parameters:
- `x-myvendor-avoid-road`: multi-valued: A14, M11
-[automotive domain]: https://wiki.apertis.org/mediawiki/index.php/Glossary#automotive-domain
+[automotive domain]: {{< ref "glossary.md#automotive-domain" >}}
[point of interest stream]: {{< ref "points_of_interest.md#General_POI_providers" >}}
diff --git a/content/designs/inter-domain-communication.md b/content/designs/inter-domain-communication.md
index 8edc6afef7626aefda3c1cd80c00fc756ab74aec..fff96a21a69f53a38ff70199e14356b01d835f2a 100644
--- a/content/designs/inter-domain-communication.md
+++ b/content/designs/inter-domain-communication.md
@@ -3699,7 +3699,7 @@ to trasfer frames are recommended on single board setups (virtualised or contain
[dbus-api-versioning]: http://dbus.freedesktop.org/doc/dbus-api-design.html#api-versioning
-[Debug and Logging design]: https://wiki.apertis.org/mediawiki/index.php/ConceptDesigns
+[Debug and Logging design]: {{< ref "debug-and-logging.md" >}}
[Bustle]: http://willthompson.co.uk/bustle/
diff --git a/content/designs/license-applying.md b/content/designs/license-applying.md
index f1069c25b82abd18e351e08bc705a9dd5b5690a1..761be5eb5f58217568f5508e785faba4ac517656 100644
--- a/content/designs/license-applying.md
+++ b/content/designs/license-applying.md
@@ -70,7 +70,7 @@ For example, it could look like:
```
<project> is an Apertis project and follows the licensing guidelines as
-specified at https://wiki.apertis.org/Licensing.
+specified at https://www.apertis.org/designs/license-applying/".
Code
----
diff --git a/content/designs/multiuser.md b/content/designs/multiuser.md
index 6e04942d290787edbae068ab543716d7032f6d28..63a9ad8c0782c24d5e10d4648361195be38919f9 100644
--- a/content/designs/multiuser.md
+++ b/content/designs/multiuser.md
@@ -18,9 +18,8 @@ more concrete documents describing particular use-cases and
recommendations for how those use-cases can be addressed.
At the time of writing, there is one such document, “Multiuser Design:
-Transactional Switchingâ€. Please see
-[*https://wiki.apertis.org/ConceptDesigns*]( {{< ref "/concepts/_index.md" >}} )
-for current design documents.
+Transactional Switchingâ€. Please see the
+[current design documents]( {{< ref "/concepts/_index.md" >}} ).
The driving force behind having a multi-user system is to allow
customization of the system. A car may have multiple drivers and
@@ -1418,4 +1417,4 @@ appropriate user ID, either with ( [Switching between compositors with a system
[resurrecting duckling]: https://www.cl.cam.ac.uk/~fms27/duckling/
-[Applications design]: https://wiki.apertis.org/mediawiki/index.php/ConceptDesigns
+[Applications design]: {{< ref "applications.md" >}}
diff --git a/content/designs/test-data-storage.md b/content/designs/test-data-storage.md
index 8a3637fcbc091a7886b38973d5fcf84cc59bc396..754778b02b7e9569d02f8b3106ef070221bbf495 100644
--- a/content/designs/test-data-storage.md
+++ b/content/designs/test-data-storage.md
@@ -671,7 +671,7 @@ expected:
regardless of if you move your finger/mouse vertically"
example:
- - video: https://wiki.apertis.org/static/Aligned-scroll.ogv
+ - video: https://www.apertis.org/images/Aligned-scroll.ogv
notes:
- "Both mouse and touchscreen need to PASS for this test case to be considered a PASS.
diff --git a/content/policies/upstream_first.md b/content/policies/upstream_first.md
deleted file mode 100644
index a15fa7e4cb2065660090418ff789271c628cc9f1..0000000000000000000000000000000000000000
--- a/content/policies/upstream_first.md
+++ /dev/null
@@ -1,15 +0,0 @@
-+++
-date = "2019-10-24"
-weight = 100
-
-title = "Upstream First"
-
-aliases = [
- "/old-wiki/Upstream_first",
- "/old-wiki/Upstream_First"
-]
-+++
-
-Please see the [Upstream First
-Policy]( {{< ref "contribution_process.md#upstream-first-policy" >}} )
-on <https://designs.apertis.org>.