diff --git a/client/pom.xml b/client/pom.xml
index 331f9a7387..d14e8315f1 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.asynchttpclient</groupId>
 		<artifactId>async-http-client-project</artifactId>
-		<version>2.0.3-SNAPSHOT</version>
+		<version>2.0.3-HH3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>async-http-client</artifactId>
diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ConnectSuccessInterceptor.java b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ConnectSuccessInterceptor.java
index 8da166e208..051c8f8199 100644
--- a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ConnectSuccessInterceptor.java
+++ b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ConnectSuccessInterceptor.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import org.asynchttpclient.Realm;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.RequestBuilder;
 import org.asynchttpclient.netty.NettyResponseFuture;
@@ -28,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.asynchttpclient.Dsl.realm;
+
 public class ConnectSuccessInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConnectSuccessInterceptor.class);
@@ -54,6 +57,13 @@ public boolean exitAfterHandlingConnect(//
         Uri requestUri = request.getUri();
         LOGGER.debug("Connecting to proxy {} for scheme {}", proxyServer, requestUri.getScheme());
 
+        if (future.getProxyRealm() != null && future.getProxyRealm().getScheme() == Realm.AuthScheme.BASIC) {
+            Realm newBasicRealm = realm(future.getProxyRealm())
+              .setUsePreemptiveAuth(false)
+              .build();
+            future.setProxyRealm(newBasicRealm);
+        }
+
         channelManager.upgradeProtocol(channel.pipeline(), requestUri);
         future.setReuseChannel(true);
         future.setConnectAllowed(false);
diff --git a/extras/guava/pom.xml b/extras/guava/pom.xml
index c9a623458f..18b15db7fe 100644
--- a/extras/guava/pom.xml
+++ b/extras/guava/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.asynchttpclient</groupId>
         <artifactId>async-http-client-extras-parent</artifactId>
-        <version>2.0.3-SNAPSHOT</version>
+        <version>2.0.3-HH3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>async-http-client-extras-guava</artifactId>
diff --git a/extras/jdeferred/pom.xml b/extras/jdeferred/pom.xml
index de2940e411..6f299af7e1 100644
--- a/extras/jdeferred/pom.xml
+++ b/extras/jdeferred/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>async-http-client-extras-parent</artifactId>
     <groupId>org.asynchttpclient</groupId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.3-HH3-SNAPSHOT</version>
   </parent>
   <artifactId>async-http-client-extras-jdeferred</artifactId>
   <name>Asynchronous Http Client JDeferred Extras</name>
diff --git a/extras/pom.xml b/extras/pom.xml
index b6010479c5..e0bb800728 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.asynchttpclient</groupId>
         <artifactId>async-http-client-project</artifactId>
-        <version>2.0.3-SNAPSHOT</version>
+        <version>2.0.3-HH3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>async-http-client-extras-parent</artifactId>
diff --git a/extras/registry/pom.xml b/extras/registry/pom.xml
index feccfef7cb..57b72e1bc5 100644
--- a/extras/registry/pom.xml
+++ b/extras/registry/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.asynchttpclient</groupId>
 		<artifactId>async-http-client-extras-parent</artifactId>
-		<version>2.0.3-SNAPSHOT</version>
+		<version>2.0.3-HH3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>async-http-client-extras-registry</artifactId>
diff --git a/extras/rxjava/pom.xml b/extras/rxjava/pom.xml
index 41eda1bc66..2a845feb32 100644
--- a/extras/rxjava/pom.xml
+++ b/extras/rxjava/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>async-http-client-extras-parent</artifactId>
         <groupId>org.asynchttpclient</groupId>
-        <version>2.0.3-SNAPSHOT</version>
+        <version>2.0.3-HH3-SNAPSHOT</version>
     </parent>
     <artifactId>async-http-client-extras-rxjava</artifactId>
     <name>Asynchronous Http Client RxJava Extras</name>
diff --git a/extras/simple/pom.xml b/extras/simple/pom.xml
index dbf5b1513c..d1b141be6b 100644
--- a/extras/simple/pom.xml
+++ b/extras/simple/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>async-http-client-extras-parent</artifactId>
         <groupId>org.asynchttpclient</groupId>
-        <version>2.0.3-SNAPSHOT</version>
+        <version>2.0.3-HH3-SNAPSHOT</version>
     </parent>
     <artifactId>async-http-client-extras-simple</artifactId>
     <name>Asynchronous Http Simple Client</name>
diff --git a/netty-bp/codec-dns/pom.xml b/netty-bp/codec-dns/pom.xml
index 996f355de8..f3eaa30758 100644
--- a/netty-bp/codec-dns/pom.xml
+++ b/netty-bp/codec-dns/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.asynchttpclient</groupId>
     <artifactId>netty-bp</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.3-HH3-SNAPSHOT</version>
   </parent>
 
   <artifactId>netty-codec-dns</artifactId>
diff --git a/netty-bp/pom.xml b/netty-bp/pom.xml
index ad585866ff..eee35a09e3 100644
--- a/netty-bp/pom.xml
+++ b/netty-bp/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.asynchttpclient</groupId>
 		<artifactId>async-http-client-project</artifactId>
-		<version>2.0.3-SNAPSHOT</version>
+		<version>2.0.3-HH3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>netty-bp</artifactId>
diff --git a/netty-bp/resolver-dns/pom.xml b/netty-bp/resolver-dns/pom.xml
index 3b80289e5c..a5f4f0dafe 100644
--- a/netty-bp/resolver-dns/pom.xml
+++ b/netty-bp/resolver-dns/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.asynchttpclient</groupId>
 		<artifactId>netty-bp</artifactId>
-		<version>2.0.3-SNAPSHOT</version>
+		<version>2.0.3-HH3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>netty-resolver-dns</artifactId>
diff --git a/netty-bp/resolver/pom.xml b/netty-bp/resolver/pom.xml
index 85c8396306..0531a3c580 100644
--- a/netty-bp/resolver/pom.xml
+++ b/netty-bp/resolver/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.asynchttpclient</groupId>
     <artifactId>netty-bp</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.3-HH3-SNAPSHOT</version>
   </parent>
 
   <artifactId>netty-resolver</artifactId>
diff --git a/netty-bp/resolver/src/test/java/io/netty/resolver/HostsFileParserTest.java b/netty-bp/resolver/src/test/java/io/netty/resolver/HostsFileParserTest.java
index dfa7a495e5..bc059107b9 100644
--- a/netty-bp/resolver/src/test/java/io/netty/resolver/HostsFileParserTest.java
+++ b/netty-bp/resolver/src/test/java/io/netty/resolver/HostsFileParserTest.java
@@ -44,7 +44,7 @@ public void testParse() throws IOException {
 
         Map<String, InetAddress> entries = HostsFileParser.parse(new BufferedReader(new StringReader(hostsString)));
 
-        assertEquals("Expected 6 entries", 6, entries.size());
+        assertEquals("Expected 7 entries", 7, entries.size());
         assertEquals("127.0.0.1", entries.get("host1").getHostAddress());
         assertEquals("192.168.0.1", entries.get("host2").getHostAddress());
         assertEquals("192.168.0.2", entries.get("host3").getHostAddress());
diff --git a/pom.xml b/pom.xml
index 9e6c6f6ded..a4e774b55e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>9</version>
+		<groupId>ru.headhunter.commons</groupId>
+		<artifactId>common-pom</artifactId>
+		<version>1.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.asynchttpclient</groupId>
 	<artifactId>async-http-client-project</artifactId>
 	<name>Asynchronous Http Client Project</name>
-	<version>2.0.3-SNAPSHOT</version>
+	<version>2.0.3-HH3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>
         The Async Http Client (AHC) library's purpose is to allow Java
@@ -18,10 +18,11 @@
     </description>
 	<url>http://github.com/AsyncHttpClient/async-http-client</url>
 	<scm>
-		<url>https://github.com/AsyncHttpClient/async-http-client</url>
-		<connection>scm:git:git@github.com:AsyncHttpClient/async-http-client.git</connection>
-		<developerConnection>scm:git:git@github.com:AsyncHttpClient/async-http-client.git</developerConnection>
-	</scm>
+		<url>https://github.com/Aulust/async-http-client</url>
+		<connection>scm:git:git@github.com:Aulust/async-http-client.git</connection>
+		<developerConnection>scm:git:git@github.com:Aulust/async-http-client.git</developerConnection>
+	  <tag>HEAD</tag>
+  </scm>
 	<issueManagement>
 		<system>jira</system>
 		<url>https://issues.sonatype.org/browse/AHC</url>
@@ -214,25 +215,6 @@
 			</properties>
 		</profile>
 	</profiles>
-	<distributionManagement>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Sonatype Release</name>
-			<url>http://oss.sonatype.org/service/local/staging/deploy/maven2
-            </url>
-		</repository>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>sonatype-nexus-snapshots</name>
-			<url>${distMgmtSnapshotsUrl}</url>
-		</snapshotRepository>
-	</distributionManagement>
-	<repositories>
-		<repository>
-			<id>maven.java.net</id>
-			<url>https://maven.java.net/content/repositories/releases</url>
-		</repository>
-	</repositories>
 	<modules>
 		<module>netty-bp</module>
 		<module>client</module>