diff --git a/app/modules/ConductRModule.scala b/app/modules/ConductRDocRendererModule.scala
similarity index 88%
rename from app/modules/ConductRModule.scala
rename to app/modules/ConductRDocRendererModule.scala
index adec7d1..0f190c1 100644
--- a/app/modules/ConductRModule.scala
+++ b/app/modules/ConductRDocRendererModule.scala
@@ -10,7 +10,7 @@ import play.api.{Configuration, Environment}
 import play.api.inject.Module
 import play.api.libs.ws.WSClient
 
-object ConductRModule {
+object ConductRDocRendererModule {
 
   @Singleton
   class ConductRDocRendererProvider @Inject()(actorSystem: ActorSystem, wsClient: WSClient)
@@ -28,8 +28,8 @@ object ConductRModule {
   }
 }
 
-class ConductRModule extends Module {
-  import ConductRModule._
+class ConductRDocRendererModule extends Module {
+  import ConductRDocRendererModule._
 
   def bindings(environment: Environment,
                configuration: Configuration) = Seq(
diff --git a/app/modules/CustomApplicationLoader.scala b/app/modules/CustomApplicationLoader.scala
deleted file mode 100644
index cf96d05..0000000
--- a/app/modules/CustomApplicationLoader.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package modules
-
-import com.typesafe.conductr.bundlelib.akka.{ Env => AkkaEnv }
-import com.typesafe.conductr.bundlelib.play.{ Env => PlayEnv }
-import play.api.inject.guice.GuiceApplicationLoader
-import play.api.{Configuration, Application, ApplicationLoader}
-
-class CustomApplicationLoader extends ApplicationLoader {
-  def load(context: ApplicationLoader.Context): Application = {
-    val conductRConfig = Configuration(AkkaEnv.asConfig) ++ Configuration(PlayEnv.asConfig)
-    val newConfig = context.initialConfiguration ++ conductRConfig
-    val newContext = context.copy(initialConfiguration = newConfig)
-    (new GuiceApplicationLoader).load(newContext)
-  }
-}
diff --git a/app/plugins/ConductrPlugin.scala b/app/plugins/ConductrPlugin.scala
deleted file mode 100644
index bbf15b2..0000000
--- a/app/plugins/ConductrPlugin.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package plugins
-
-import com.typesafe.conductr.bundlelib.play.StatusService
-import com.typesafe.conductr.bundlelib.play.ConnectionContext.Implicits
-import play.api.{ Application, Plugin, Logger }
-import play.api.libs.concurrent.Execution
-
-class ConductrPlugin extends Plugin {
-  
-  override def onStart() {
-    import Implicits.defaultContext
-    StatusService.signalStartedOrExit()
-    Logger.info("Application has started")
-  }
-
-  override def onStop() {
-    Logger.info("Application shutdown...")
-  }
-
-}
diff --git a/build.sbt b/build.sbt
index 6291b24..4c9a9bd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,17 +9,17 @@ scalaVersion := "2.11.6"
 resolvers ++= Seq(
   "spray repo"          at "http://repo.spray.io",
   "patriknw at bintray" at "http://dl.bintray.com/patriknw/maven",
-  "typesafe-releases"   at "http://repo.typesafe.com/typesafe/maven-releases"
+  "typesafe-releases"   at "http://repo.typesafe.com/typesafe/maven-releases",
+  Resolver.bintrayRepo("typesafe", "maven-releases")
 )
 
 libraryDependencies ++= Seq(
   "com.github.patriknw"   %% "akka-data-replication"      % "0.11",
-  "com.typesafe.conductr" %% "akka-conductr-bundle-lib"	  % "0.8.0",
   "org.apache.commons"    %  "commons-compress" 		      % "1.8.1",
   "commons-io"            %  "commons-io"       		      % "2.4",
   "org.webjars"           %  "foundation"       	     	  % "5.5.1",
   "com.googlecode.kiama"  %% "kiama"            		      % "1.8.0",
-  "com.typesafe.conductr" %% "play24-conductr-bundle-lib"	% "0.10.0",
+  "com.typesafe.conductr" %% "play24-conductr-bundle-lib"	% "0.13.0",
   "com.typesafe.play"     %% "play-doc"         		      % "1.1.0",
   "io.spray"              %% "spray-caching"    		      % "1.3.3",
   "org.scalatest"         %% "scalatest"        		      % "2.2.4" % "test",
diff --git a/conf/application.conf b/conf/application.conf
index add76b3..e7182c4 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -35,5 +35,8 @@ app.host-aliases = {
 # Render cluster configuration
 akka.actor.provider = akka.cluster.ClusterActorRefProvider
 
-play.application.loader = "modules.CustomApplicationLoader"
-play.modules.enabled += "modules.ConductRModule"
+play.application.loader = "com.typesafe.conductr.bundlelib.play.ConductRApplicationLoader"
+
+play.modules.enabled += "com.typesafe.conductr.bundlelib.play.ConductRLifecycleModule"
+
+play.modules.enabled += "modules.ConductRDocRendererModule"
\ No newline at end of file
diff --git a/conf/play.plugins b/conf/play.plugins
deleted file mode 100644
index 3c29225..0000000
--- a/conf/play.plugins
+++ /dev/null
@@ -1 +0,0 @@
-10001:plugins.ConductrPlugin
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ba830e7..a7805cd 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,7 +4,7 @@ resolvers ++= Seq(
 )
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0-M3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0-RC1")
 
 // web plugins
 
@@ -23,4 +23,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % "1.0.1")
 addSbtPlugin("default" % "sbt-sass" % "0.1.9")
 
 // conductR
-addSbtPlugin("com.typesafe.conductr" % "sbt-conductr" % "0.30.0")
+addSbtPlugin("com.typesafe.conductr" % "sbt-conductr" % "0.34.0")