diff --git a/.travis.yml b/.travis.yml
index 0a0308f6a..32c5ead12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,4 @@ script:
 after_success:
 - sbt ++$TRAVIS_SCALA_VERSION coverageReport
 - bash <(curl -s https://codecov.io/bash) -t 744f05ba-f905-4468-aef1-f5016fc2909d
-- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
-    sbt ++$TRAVIS_SCALA_VERSION publishSigned;
-  fi
+- sbt ++$TRAVIS_SCALA_VERSION orgAfterCISuccess
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba6d0dfa2..8ecc73e3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
-Changelog
-=============
+# Changelog
 
 ## 2017/04/03 - Version 0.14.0
 
diff --git a/build.sbt b/build.sbt
index e34b6b17e..25e10a306 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,11 +6,10 @@ lazy val root = (project in file("."))
   .dependsOn(github4sJVM, github4sJS, scalaz, docs)
   .aggregate(github4sJVM, github4sJS, scalaz, docs)
   .settings(noPublishSettings: _*)
-  .settings(Seq(coverageFailOnMinimum := false))
+  .settings(coverageFailOnMinimum := false)
 
 lazy val github4s = (crossProject in file("github4s"))
   .settings(moduleName := "github4s")
-  .enablePlugins(AutomateHeaderPlugin)
   .enablePlugins(BuildInfoPlugin)
   .settings(
     buildInfoKeys := Seq[BuildInfoKey](
@@ -26,8 +25,7 @@ lazy val github4s = (crossProject in file("github4s"))
   .jsSettings(jsDeps: _*)
 
 lazy val github4sJVM = github4s.jvm
-lazy val github4sJS  = github4s.js
-  .settings(Seq(coverageFailOnMinimum := false))
+lazy val github4sJS  = github4s.js.settings(coverageFailOnMinimum := false)
 
 lazy val docs = (project in file("docs"))
   .dependsOn(scalaz)
@@ -40,6 +38,5 @@ lazy val docs = (project in file("docs"))
 lazy val scalaz = (project in file("scalaz"))
   .settings(moduleName := "github4s-scalaz")
   .settings(scalazDependencies: _*)
-  .settings(Seq(coverageFailOnMinimum := false))
+  .settings(coverageFailOnMinimum := false)
   .dependsOn(github4sJVM)
-  .enablePlugins(AutomateHeaderPlugin)
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index 3e2db56c5..e6679efc0 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -1,9 +1,7 @@
 import com.typesafe.sbt.site.jekyll.JekyllPlugin.autoImport._
-import de.heikoseeberger.sbtheader.HeaderKey.headers
-import de.heikoseeberger.sbtheader.license.Apache2_0
 import microsites.MicrositesPlugin.autoImport._
 import sbt.Keys._
-import sbt._
+import sbt.{Def, _}
 import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
 import sbtorgpolicies._
 import sbtorgpolicies.model._
@@ -39,8 +37,8 @@ object ProjectPlugin extends AutoPlugin {
           %%("circe-parser"),
           %%("base64"),
           %%("circe-parser"),
-          %%("scalatest") % "test",
-          "org.mockito" % "mockito-core" % "2.7.19" % "test",
+          %%("scalatest")   % "test",
+          %("mockito-core") % "test",
           compilerPlugin(%%("paradise") cross CrossVersion.full)
         ))
 
@@ -52,20 +50,20 @@ object ProjectPlugin extends AutoPlugin {
       )
     )
 
-    lazy val jsDeps = Seq(libraryDependencies += %%("roshttp"))
+    lazy val jsDeps: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%("roshttp")
 
-    lazy val docsDependencies = libraryDependencies += %%("scalatest")
+    lazy val docsDependencies: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%("scalatest")
 
-    lazy val scalazDependencies = Seq(libraryDependencies += %%("scalaz-concurrent"))
+    lazy val scalazDependencies: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%(
+      "scalaz-concurrent")
   }
 
-  override def projectSettings =
+  override def projectSettings: Seq[Def.Setting[_]] =
     Seq(
       name := "github4s",
       description := "Github API wrapper written in Scala",
       startYear := Option(2016),
       resolvers += Resolver.sonatypeRepo("snapshots"),
-      orgLicenseSetting := sbtorgpolicies.model.MITLicense,
       scalaVersion := scalac.`2.12`,
       crossScalaVersions := "2.10.6" :: scalac.crossScalaVersions,
       scalaOrganization := "org.scala-lang",
@@ -73,9 +71,6 @@ object ProjectPlugin extends AutoPlugin {
         case "2.10" => Seq("-Xdivergence211")
         case _      => Nil
       }),
-      headers := Map(
-        "scala" -> Apache2_0("2016-2017", "47 Degrees, LLC. <http://www.47deg.com>")
-      ),
       // This is necessary to prevent packaging the BuildInfo with
       // sensible information like the Github token. Do not remove.
       mappings in (Compile, packageBin) ~= { (ms: Seq[(File, String)]) =>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d7f8c4d4f..c4e04695f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
-addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.3.1")
+addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.0")