diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index dfc5bf8..f17edfd 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -8,7 +8,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala)
 scalaVersion := "$scala_version$"
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.0-M1" % Test
 
 // Adds additional packages into Twirl
 //TwirlKeys.templateImports += "$organization$.controllers._"
diff --git a/src/main/g8/conf/logback.xml b/src/main/g8/conf/logback.xml
index 23f6dd6..ab6c2b1 100644
--- a/src/main/g8/conf/logback.xml
+++ b/src/main/g8/conf/logback.xml
@@ -14,7 +14,7 @@
     <file>${application.home:-.}/logs/application.log</file>
     <encoder class="PatternLayoutEncoder">
       <charset>UTF-8</charset>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{akkaSource}) %msg%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
     </encoder>
   </appender>
 
@@ -27,7 +27,7 @@
     <!-- <withJansi>true</withJansi> -->
     <encoder class="PatternLayoutEncoder">
       <charset>UTF-8</charset>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{akkaSource}) %msg%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
     </encoder>
   </appender>
 
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index 6940fb1..4b327c2 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -5,7 +5,7 @@ verbatim=*.css *.js *.png logback.xml
 
 # We use `play-exceptions` artifact as undependend of Scala version
 # just to find the latest version of Play in Maven Central
-play_version = maven(com.typesafe.play, play-exceptions)
+play_version = maven(org.playframework, play-exceptions)
 scala_version = maven(org.scala-lang, scala-library, stable)
 # We use `giter8_2.13` to find the latest version of sbt-giter8-scaffold_2.12_1.0
 sbt_giter8_scaffold_version = maven(org.foundweekends.giter8, giter8_2.13)
diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt
index c434ae8..41bccb0 100644
--- a/src/main/g8/project/plugins.sbt
+++ b/src/main/g8/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "$play_version$")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "$play_version$")
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "$sbt_giter8_scaffold_version$")