diff --git a/akka-docs/src/main/paradox/cluster-usage.md b/akka-docs/src/main/paradox/cluster-usage.md
index 6c289dcd69..0962f3190e 100644
--- a/akka-docs/src/main/paradox/cluster-usage.md
+++ b/akka-docs/src/main/paradox/cluster-usage.md
@@ -815,7 +815,7 @@ From JMX you can:
  * mark any node in the cluster as down
  * tell any node in the cluster to leave
 
-Member nodes are identified by their address, in format *akka.<protocol>://<actor-system-name>@<hostname>:<port>*.
+Member nodes are identified by their address, in format *akka.**protocol**://**actor-system-name**@**hostname**:**port***.
 
 <a id="cluster-command-line"></a>
 ### Command Line
diff --git a/akka-docs/src/main/paradox/distributed-data.md b/akka-docs/src/main/paradox/distributed-data.md
index 1fb57040af..0d83eb808a 100644
--- a/akka-docs/src/main/paradox/distributed-data.md
+++ b/akka-docs/src/main/paradox/distributed-data.md
@@ -783,7 +783,7 @@ data entries, because then the remote message size will be too large.
 
  * [Eventually Consistent Data Structures](https://vimeo.com/43903960)
 talk by Sean Cribbs
- * [Strong Eventual Consistency and Conflict-free Replicated Data Types (video)](https://www.youtube.com/watch?v=oyUHd894w18&feature=youtu.be)
+ * [Strong Eventual Consistency and Conflict-free Replicated Data Types (video)](https://www.youtube.com/watch?v=oyUHd894w18&amp;feature=youtu.be)
 talk by Mark Shapiro
  * [A comprehensive study of Convergent and Commutative Replicated Data Types](http://hal.upmc.fr/file/index/docid/555588/filename/techreport.pdf)
 paper by Mark Shapiro et. al.
diff --git a/akka-docs/src/main/paradox/futures.md b/akka-docs/src/main/paradox/futures.md
index d849b217d3..a221d62de6 100644
--- a/akka-docs/src/main/paradox/futures.md
+++ b/akka-docs/src/main/paradox/futures.md
@@ -110,11 +110,11 @@ In this example, when you need information about a user, you send a request mess
 then it gets the corresponding result from the appropriate backend actor based on the request message type.
 
 <p align="center">
-  <img src="images/futures-pipeto1.png">
+  <img src="images/futures-pipeto1.png"/>
 </p>
 
 <p align="center">
-  <img src="images/futures-pipeto2.png">
+  <img src="images/futures-pipeto2.png"/>
 </p>
 
 The message types you send to `UserProxyActor` are `GetUserData` and `GetUserActivities`:
diff --git a/akka-docs/src/main/paradox/guide/tutorial_1.md b/akka-docs/src/main/paradox/guide/tutorial_1.md
index f296dfc41f..679130ea9b 100644
--- a/akka-docs/src/main/paradox/guide/tutorial_1.md
+++ b/akka-docs/src/main/paradox/guide/tutorial_1.md
@@ -34,7 +34,7 @@ In the Hello World example, we have already seen how `system.actorOf()`, creates
 _user defined_ hierarchy. You typically have only one (or very few) top level actors in your `ActorSystem`.
 We create child, or non-top-level, actors by invoking `context.actorOf()` from an existing actor. The `context.actorOf()` method has a signature identical to `system.actorOf()`, its top-level counterpart.
 
-The easiest way to see the actor hierarchy in action is to print `ActorRef` instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&project=akka-quickstart-java)].
+The easiest way to see the actor hierarchy in action is to print `ActorRef` instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&amp;project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&amp;project=akka-quickstart-java)].
 
 
 In your Hello World project, navigate to the `com.example` package and create a new @scala[Scala file called `ActorHierarchyExperiments.scala`]@java[Java file called `ActorHierarchyExperiments.java`] here. Copy and paste the code from the snippet below to this new source file. Save your file and run `sbt "runMain com.example.ActorHierarchyExperiments"` to observe the output.
diff --git a/akka-docs/src/main/paradox/typed/guide/tutorial_1.md b/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
index bb6c962784..ce5372d34c 100644
--- a/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
+++ b/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
@@ -42,7 +42,7 @@ In fact, before you create an actor in your code, Akka has already created three
    you, it has nothing to do with end users, nor with user handling. Every actor you create using the Akka library will have the constant path `/user/` prepended to it.
  - `/system` the _system guardian_. Akka or other libraries built on top of Akka may create actors in the _system_ namespace.
 
-The easiest way to see the actor hierarchy in action is to print `ActorRef` instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&project=akka-quickstart-java)].
+The easiest way to see the actor hierarchy in action is to print `ActorRef` instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&amp;project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](http://developer.lightbend.com/start/?group=akka&amp;project=akka-quickstart-java)].
 
 FIXME update link to Quickstart to the Typed version, when it's ready, issue https://github.com/akka/akka/issues/25997
 
diff --git a/build.sbt b/build.sbt
index 280e53f1bf..cb3a149439 100644
--- a/build.sbt
+++ b/build.sbt
@@ -235,8 +235,8 @@ lazy val docs = akkaModule("akka-docs")
   .settings(Dependencies.docs)
   .settings(
     name in (Compile, paradox) := "Akka",
-    paradoxProperties ++= Map(
-      "akka.canonical.base_url" -> "https://doc.akka.io/docs/akka/current",
+    Compile / paradoxProperties ++= Map(
+      "canonical.base_url" -> "https://doc.akka.io/docs/akka/current",
       "github.base_url" -> GitHub.url(version.value), // for links like this: @github[#1](#1) or @github[83986f9](83986f9)
       "extref.akka.http.base_url" -> "https://doc.akka.io/docs/akka-http/current/%s",
       "extref.wikipedia.base_url" -> "https://en.wikipedia.org/wiki/%s",
@@ -259,7 +259,7 @@ lazy val docs = akkaModule("akka-docs")
       "fiddle.code.base_dir" -> (sourceDirectory in Test).value.getAbsolutePath,
       "fiddle.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath,
     ),
-    paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
+    Compile / paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
     resolvers += Resolver.jcenterRepo,
     deployRsyncArtifact := List((paradox in Compile).value -> s"www/docs/akka/${version.value}")
   )
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index e37e515a2c..4df8d13466 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -139,9 +139,9 @@ object AkkaBuild {
       ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet,
 
       licenses := Seq(("Apache License, Version 2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))),
-      homepage := Some(url("http://akka.io/")),
+      homepage := Some(url("https://akka.io/")),
 
-      apiURL := Some(url(s"http://doc.akka.io/api/akka/${version.value}")),
+      apiURL := Some(url(s"https://doc.akka.io/api/akka/${version.value}")),
 
       initialCommands :=
         """|import language.postfixOps
diff --git a/project/GitHub.scala b/project/GitHub.scala
index 987c801f11..ab69f234b3 100644
--- a/project/GitHub.scala
+++ b/project/GitHub.scala
@@ -17,6 +17,6 @@ object GitHub {
 
   def url(v: String): String = {
     val branch = if (v.endsWith("SNAPSHOT")) "master" else "v" + v
-    "http://github.com/akka/akka/tree/" + branch
+    "https://github.com/akka/akka/tree/" + branch
   }
 }
diff --git a/project/Publish.scala b/project/Publish.scala
index 2e559cd8fb..5245fa62f1 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -21,7 +21,7 @@ object Publish extends AutoPlugin {
     publishTo := akkaPublishTo.value,
     credentials ++= akkaCredentials,
     organizationName := "Lightbend Inc.",
-    organizationHomepage := Some(url("http://www.lightbend.com")),
+    organizationHomepage := Some(url("https://www.lightbend.com")),
     publishMavenStyle := true,
     pomIncludeRepository := { x => false },
     defaultPublishTo := crossTarget.value / "repository")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f5db56edf1..63cccf3c16 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -15,7 +15,8 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.15")
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.14")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.5.3")
+addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.16")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.13")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") // for maintenance of copyright file header