diff --git a/project/Publish.scala b/project/Publish.scala
index ddb64d2d4..0309d9349 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -15,6 +15,7 @@
 
 import sbt._
 import sbt.Keys._
+import scala.util.Properties
 
 object Publish {
 
@@ -27,8 +28,8 @@ object Publish {
     publishMavenStyle := true,
     publishArtifact in Test := false
   )
-
-  def kamonRepo = Some(Resolver.sftp("Kamon Snapshots Repository", "snapshots.kamon.io", "/var/local/snapshots-repo"))
+  val baseUrl: String = "http://artifactory.ad.boomtownroi.com/artifactory"
+  def kamonRepo = Some("Artifactory Realm" at s"$baseUrl/libs-release-local")
 
   def kamonPomExtra = {
     <url>http://kamon.io</url>
diff --git a/project/Release.scala b/project/Release.scala
index a388a66f4..d016068c8 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -45,12 +45,13 @@ object Release {
     sonatypeSettings ++
     Seq(
       // sbt-sonatype overrides publishTo. So we need to restore kamon repo declaration for snapshots
-      publishTo := { if (isSnapshot.value) Publish.kamonRepo else publishTo.value }
+      publishTo := { if (isSnapshot.value) Publish.kamonRepo else Publish.kamonRepo },
+      credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
     )
 
 
   def kamonSonatypeCredentials =
-    Credentials.toDirect(Credentials(Path.userHome / ".ivy2" / "kamon-credentials-sonatype.properties"))
+    Credentials(Path.userHome / ".ivy2" / ".credentials")
 
   /**
    * Hijacked from [[sbtrelease.ReleaseStateTransformations.publishArtifacts]]
@@ -77,4 +78,4 @@ object Release {
     ), st)
   })
 
-}
\ No newline at end of file
+}
diff --git a/version.sbt b/version.sbt
index a40c96ba1..4cc99e3e0 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.6.3"
+version in ThisBuild := "0.6.3-bt"