diff --git a/.circleci/circle.yml b/.circleci/circle.yml
new file mode 100644
index 000000000..cb1e2ba61
--- /dev/null
+++ b/.circleci/circle.yml
@@ -0,0 +1,49 @@
+version: 2
+jobs:
+  build_and_test_jdk8:
+    working_directory: ~/authmereloaded-jdk8
+    docker:
+      - image: circleci/openjdk:8-jdk
+    environment:
+        MAVEN_OPTS: -Xmx2048m
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - authmereloaded-{{ checksum "pom.xml" }}
+          - authmereloaded-
+     - run: mvn -T 2 dependency:go-offline
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: authmereloaded-{{ checksum "pom.xml" }}
+      - run: mvn -T 2 package
+      - store_test_results:
+          path: target/surefire-reports
+      - store_artifacts:
+          path: target/*.jar
+  build_and_test_jdk9:
+    working_directory: ~/authmereloaded-jdk9
+    docker:
+      - image: circleci/openjdk:9-jdk
+    environment:
+        MAVEN_OPTS: -Xmx2048m
+    steps:
+      - checkout
+      - restore_cache:
+          key: authmereloaded-{{ checksum "pom.xml" }}
+     - run: mvn -T 2 dependency:go-offline
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: authmereloaded-{{ checksum "pom.xml" }}
+      - run: mvn -T 2 package
+      - store_test_results:
+          path: target/surefire-reports
+      - run: cp ./target/*.jar $CIRCLE_ARTIFACTS
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build_and_test_jdk8
+      - build_and_test_jdk9
diff --git a/.github/ISSUE_TEMPLATE.MD b/.github/ISSUE_TEMPLATE.MD
index dce4b445f..c8c99783b 100644
--- a/.github/ISSUE_TEMPLATE.MD
+++ b/.github/ISSUE_TEMPLATE.MD
@@ -19,7 +19,7 @@ Standalone server/Bungeecord network, SQLite/MySql, ...
 This can be found by running `/authme version`
 
 ### Error Log:
-Pastebin/Hastebin/Gist link of the error logo or stacktrace (if any)
+Pastebin/Hastebin/Gist link of the error log or stacktrace (if any)
 
 ### Configuration:
 Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sensitive data)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 56146b568..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-sudo: required
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
-      - git
-
-language: java
-jdk:
-  - oraclejdk8
-  - oraclejdk9
-
-before_script:
-    - "sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src"
-    - "cd argon2-src && sudo make && sudo make install && cd .."
-
-script: mvn clean verify -B
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/952357dbd9d3cea70fd5
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
diff --git a/README.md b/README.md
index 7a0994c1c..ee54889dc 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@
 
 - CI Services:
   - [Official Jenkins](http://ci.xephi.fr/job/AuthMeReloaded) (**DEVELOPMENT BUILDS**)
-  - Travis CI: [![Travis CI](https://travis-ci.org/AuthMe/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/AuthMe/AuthMeReloaded)
   - CircleCI: [![CircleCI](https://circleci.com/gh/AuthMe/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe/AuthMeReloaded)
 
 - Project status:
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 169726b8a..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-machine:
-  java:
-    version: oraclejdk8
-dependencies:
-  pre:
-    - "sudo apt-get update; sudo apt-get install -y git; sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src; cd argon2-src; sudo make; sudo make install"
-general:
-  artifacts:
-    - "target/AuthMe-*.jar"
-test:
-  override:
-    - mvn clean install -B
-  post:
-    - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS
-    - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS/AuthMe.jar
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/7b92ac1a1741748b26bf
diff --git a/pom.xml b/pom.xml
index 4a5292ce8..b508bfa19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <ciManagement>
         <system>jenkins</system>
-        <url>http://ci.xephi.fr/job/AuthMeReloaded/</url>
+        <url>http://ci.codemc.org/job/AuthMeReloaded/</url>
     </ciManagement>
 
     <issueManagement>
@@ -106,7 +106,7 @@
 
     <build>
         <defaultGoal>clean install</defaultGoal>
-        <finalName>${project.outputName}-${project.version}</finalName>
+        <finalName>${project.outputName}-${project.version}-noshade</finalName>
 
         <resources>
             <resource>
@@ -197,6 +197,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <finalName>${project.outputName}-${project.version}</finalName>
                     <show>public</show>
                     <failOnError>false</failOnError>
                 </configuration>
@@ -213,6 +214,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <finalName>${project.outputName}-${project.version}</finalName>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -228,6 +232,8 @@
                 </executions>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <finalName>${project.outputName}-${project.version}</finalName>
 
                     <!--
                     Relocate all lib we use in order to fix class loading errors if we use different versions
@@ -287,54 +293,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
-                <executions>
-                    <execution>
-                        <id>default-install</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>install-custom</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <pomFile>pom.xml</pomFile>
-                    <file>target/original-${project.build.finalName}.jar</file>
-                    <javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
-                    <sources>target/${project.build.finalName}-sources.jar</sources>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>deploy-custom</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- TODO: find a solution to detect release/snapshot -->
-                    <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId>
-                    <url>${project.distributionManagement.snapshotRepository.url}</url>
-                    <pomFile>pom.xml</pomFile>
-                    <file>target/original-${project.build.finalName}.jar</file>
-                    <!-- Already included by the plugin
-                    <javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
-                    <sources>target/${project.build.finalName}-sources.jar</sources>
-                    -->
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>