diff --git a/.gitignore b/.gitignore
index e64dd86c..0e4deb27 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,4 @@ bin/
 .DS_Store
 
 # PGP keys
-pubring.gpg
 secring.gpg
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index d5d0bac0..043835a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,20 @@
 language: scala
 scala:
-  - 2.11.7
+- 2.11.8
 jdk:
-  - oraclejdk8
+- oraclejdk8
 script:
-  - sbt test
+- sbt test
+
+before_install:
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+     openssl aes-256-cbc -K $encrypted_e3665000fc5c_key -iv $encrypted_e3665000fc5c_iv -in secring.gpg.enc -out secring.gpg -d;
+  fi
+
 after_success:
-  - bash deploy.sh
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+     sbt compile publishSigned;
+  fi
+- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
+     echo "Not in master branch, skipping deploy and release";
+  fi
diff --git a/build.sbt b/build.sbt
index 37b40aab..ddc21f1a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,7 +24,7 @@ lazy val stdlib = (project in file("."))
 
 // Distribution
 
-lazy val gpgFolder = sys.env.getOrElse("SE_GPG_FOLDER", ".")
+lazy val gpgFolder = sys.env.getOrElse("PGP_FOLDER", ".")
 
 lazy val publishSettings = Seq(
   organizationName := "Scala Exercises",
@@ -32,7 +32,7 @@ lazy val publishSettings = Seq(
   startYear := Some(2016),
   description := "Scala Exercises: The path to enlightenment",
   homepage := Some(url("http://scala-exercises.org")),
-  pgpPassphrase := Some(sys.env.getOrElse("SE_GPG_PASSPHRASE", "").toCharArray),
+  pgpPassphrase := Some(sys.env.getOrElse("PGP_PASSPHRASE", "").toCharArray),
   pgpPublicRing := file(s"$gpgFolder/pubring.gpg"),
   pgpSecretRing := file(s"$gpgFolder/secring.gpg"),
   credentials += Credentials("Sonatype Nexus Repository Manager",  "oss.sonatype.org",  sys.env.getOrElse("PUBLISH_USERNAME", ""),  sys.env.getOrElse("PUBLISH_PASSWORD", "")),
@@ -47,28 +47,5 @@ lazy val publishSettings = Seq(
       Some("Snapshots" at nexus + "content/repositories/snapshots")
     else
       Some("Releases" at nexus + "service/local/staging/deploy/maven2")
-  },
-  pomExtra :=
-      <developers>
-        <developer>
-          <id>raulraja</id>
-          <name>Raul Raja</name>
-          <email>raul@47deg.com</email>
-        </developer>
-        <developer>
-          <id>dialelo</id>
-          <name>Alejandro Gómez</name>
-          <email>al.g.g@47deg.com</email>
-        </developer>
-        <developer>
-          <id>rafaparadela</id>
-          <name>Rafa Paradela</name>
-          <email>rafa.p@47deg.com</email>
-        </developer>
-        <developer>
-          <id>MasseGuillaume</id>
-          <name>Guillaume Massé</name>
-          <email>masgui@gmail.com</email>
-        </developer>
-      </developers>
+  }
 )
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 95aabbb8..00000000
--- a/deploy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-function decipherKeys {
-   echo $KEYS_PASSPHRASE | gpg --passphrase-fd 0 keys.tar.gpg
-   tar xfv keys.tar
-}
-
-function publish {
-   sbt compile publishSigned
-}
-
-function release {
-    decipherKeys
-    publish
-}
-
-if [[ $TRAVIS_BRANCH == 'master' ]]; then
-   echo "Master branch, releasing..."
-   release
-else
-    echo "Not in master branch, skipping release"
-fi
-
diff --git a/keys.tar.gpg b/keys.tar.gpg
deleted file mode 100644
index 4be048e6..00000000
Binary files a/keys.tar.gpg and /dev/null differ
diff --git a/pubring.gpg b/pubring.gpg
new file mode 100644
index 00000000..c7e3925b
--- /dev/null
+++ b/pubring.gpg
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.51
+
+mQENBFgGJjoBCACkQzvPI+1VtMYz252a3i3wm1dKrsF5v/E//IsYLMsXx/4BICES
+bjZchmCbaIqjaNrfBxRAR20KbWVXbUptDJgXA/WOyGEUfDvS6Kfm1F6A34qVyCIr
+NPEIeDVM64nLpQFrNuIiFPlTj9eXbKPRbV0eUrtKH59iplB4DCboK4ysGX3Hk/A3
+nzmAf9+Lt9N8vuzO8ymYvdWfdzQsVPCSXkKhK2qpT+ORIPAPWGdXmZ6Rr1wAGwqY
++x0iVSL2IFs5MqDvBbDoyfnt14UVffJlI6O0C+flIY+kSCp86pYQrHHaCnWrnALU
+L8Cb/DJ7DODpd99bDHtkuMHUn4BO4WmoI69zABEBAAG0JXNjYWxhLWV4ZXJjaXNl
+cyA8ZGV2ZWxvcGVyQDQ3ZGVnLmNvbT6JARwEEwECAAYFAlgGJjoACgkQT9ktcdDT
+ZI66CQgAkGDi0EOapqJbFMiNTH85IelGs2c04aNPnEGZh+dUHqpJvA785PduXtzT
+XEP8DVP4zgjfGoDyiaJWBVXyg6Ch7XZ6gNodgOS7oQu5nFsA6ZBtwVy0qfRjfK2E
+NEIvRuNjQuAlDTDHRfDtZmFIDSd4YR/smJL7BVrO5eT+qsbeluZGGi54TY/zwLbe
+TefcUmTixDhm5LGyVPKiEdZwk6o385+9IAFycFozb9K/1NSTBM1GbZBMR/WuACbT
+K+DDtqUnGk1cZmNbWzoVabNnubVhGnhMC9AW24pzHu+xEk13yXsPWVikB6NbVg50
+TBkuFf9IEXMEzanKMDDMOatih3a8bg==
+=fR5S
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/secring.gpg.enc b/secring.gpg.enc
new file mode 100644
index 00000000..8640de70
Binary files /dev/null and b/secring.gpg.enc differ