diff --git a/.codacy.yml b/.codacy.yml
new file mode 100644
index 000000000..3ec325c0e
--- /dev/null
+++ b/.codacy.yml
@@ -0,0 +1,3 @@
+---
+exclude_paths:
+    - src/integTest/resources/arquillian-tests/**
diff --git a/README.md b/README.md
index 903d27aea..997f2a130 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ci.gradle [![Build Status](https://travis-ci.org/WASdev/ci.gradle.svg?branch=master)](https://travis-ci.org/WASdev/ci.gradle) [![Maven Central Latest](https://maven-badges.herokuapp.com/maven-central/net.wasdev.wlp.gradle.plugins/liberty-gradle-plugin/badge.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.wasdev.wlp.gradle.plugins%22%20AND%20a%3A%22liberty-gradle-plugin%22) [![Build status](https://ci.appveyor.com/api/projects/status/ebq1a5qtt8ndhc57/branch/master?svg=true)](https://ci.appveyor.com/project/wasdevb1/ci-gradle-6hm2g)
+# ci.gradle [![Maven Central Latest](https://maven-badges.herokuapp.com/maven-central/net.wasdev.wlp.gradle.plugins/liberty-gradle-plugin/badge.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.wasdev.wlp.gradle.plugins%22%20AND%20a%3A%22liberty-gradle-plugin%22) [![Build Status](https://travis-ci.org/WASdev/ci.gradle.svg?branch=master)](https://travis-ci.org/WASdev/ci.gradle) [![Build status](https://ci.appveyor.com/api/projects/status/ebq1a5qtt8ndhc57/branch/master?svg=true)](https://ci.appveyor.com/project/wasdevb1/ci-gradle-6hm2g) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9fa7d434945c452cae1c4958bfda8010)](https://www.codacy.com/app/wasdevb1/ci.gradle?utm_source=github.com&utm_medium=referral&utm_content=WASdev/ci.gradle&utm_campaign=Badge_Grade)
 
 The Liberty Gradle plugin supports install and operational control of Liberty runtime and servers. Use it to manage your application on Liberty for integration test and to create Liberty server packages.
 
diff --git a/build.gradle b/build.gradle
index 8775c20d0..65b1f3533 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,7 +100,7 @@ task wrapper(type: Wrapper) {
 
 archivesBaseName = 'liberty-gradle-plugin'
 group = 'net.wasdev.wlp.gradle.plugins'
-version = '2.1.1-SNAPSHOT'
+version = '2.2-SNAPSHOT'
 
 task sourcesJar(type: Jar) {
     classifier = 'sources'
diff --git a/src/integTest/resources/arquillian-tests/build.gradle b/src/integTest/resources/arquillian-tests/build.gradle
index 15c5b3463..b413a927a 100644
--- a/src/integTest/resources/arquillian-tests/build.gradle
+++ b/src/integTest/resources/arquillian-tests/build.gradle
@@ -82,8 +82,8 @@ dependencies {
     providedCompile ('com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.persistence:1.0.18')
     providedCompile ('org.eclipse.persistence:javax.persistence:2.1.0')
 
-    arqManaged "org.jboss.arquillian.container:arquillian-liberty-managed:1.0.0.Final-SNAPSHOT"
-    arqRemote "org.jboss.arquillian.container:arquillian-liberty-remote:1.0.0.Final-SNAPSHOT"
+    arqManaged "org.jboss.arquillian.container:arquillian-wlp-managed-8.5:1.0.0.CR1"
+    arqRemote "org.jboss.arquillian.container:arquillian-wlp-remote-8.5:1.0.0.CR1"
 
     testCompile "net.wasdev.wlp.common:ci.common:1.0-SNAPSHOT"
     testCompile "junit:junit:4.12"