diff --git a/circle.yml b/circle.yml
index d778da5b5..2d355900c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,6 +4,7 @@ machine:
     version: oraclejdk8
   environment:
     AWS_PROFILE: vgs-dev
+    RELEASE_BRANCH: versioning-test
 dependencies:
   override:
     - ./env.sh
@@ -20,6 +21,10 @@ deployment:
   release:
       tag: /.*/
       commands:
-        - mvn jgitflow:release-start -X -e -DreleaseVersion=$CIRCLE_TAG
-        - mvn jgitflow:release-finish -X -e
-        - git push versioning-test
+        - git config user.name "circleci"
+        - git fetch
+        - git checkout $RELEASE_BRANCH
+        - git tag -d $CIRCLE_TAG
+        - mvn -B  -X -e  gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy
+        - git push origin $RELEASE_BRANCH
+        
diff --git a/pom.xml b/pom.xml
index 770f8a936..066d3b7c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
                 <jdk>[,1.8)</jdk>
             </activation>
             <properties>
-                <javadoc.opts />
+                <javadoc.opts/>
             </properties>
         </profile>
 
@@ -520,39 +520,28 @@
             </plugin>
 
             <plugin>
-                <groupId>external.atlassian.jgitflow</groupId>
-                <artifactId>jgitflow-maven-plugin</artifactId>
-                <version>1.0-m5.1</version>
+                <groupId>com.amashchenko.maven.plugin</groupId>
+                <artifactId>gitflow-maven-plugin</artifactId>
+                <version>1.8.0</version>
                 <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <allowUntracked>true</allowUntracked>
-                    <noDeploy>true</noDeploy>
-
-                    <flowInitContext>
-                        <developBranchName>versioning-test</developBranchName>
-                        <masterBranchName>versioning-test</masterBranchName>
-                        <versionTagPrefix/>
+                    <verbose>true</verbose>
+                    <versionDigitToIncrement>2</versionDigitToIncrement>
+                    <releaseRebase>true</releaseRebase>
+                    <pushRemote>false</pushRemote>
+                    <skipTestProject>true</skipTestProject>
+                    <allowSnapshots>true</allowSnapshots>
+
+                    <gitFlowConfig>
+                        <productionBranch>versioning-test</productionBranch>
+                        <developmentBranch>versioning-test</developmentBranch>
                         <releaseBranchPrefix>release-</releaseBranchPrefix>
-                    </flowInitContext>
-                </configuration>
-            </plugin>
+                        <versionTagPrefix></versionTagPrefix>
+                    </gitFlowConfig>
 
-            <plugin>
-                <groupId>external.atlassian.jgitflow</groupId>
-                <artifactId>jgitflow-maven-plugin</artifactId>
-                <version>1.0-m5.1</version>
-                <configuration>
-                    <enableSshAgent>true</enableSshAgent>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <allowUntracked>true</allowUntracked>
-                    <noDeploy>true</noDeploy>
-
-                    <flowInitContext>
-                        <developBranchName>versioning-test</developBranchName>
-                        <masterBranchName>versioning-test</masterBranchName>
-                        <versionTagPrefix/>
-                        <releaseBranchPrefix>release-</releaseBranchPrefix>
-                    </flowInitContext>
+                    <commitMessages>
+                        <releaseStartMessage>update versions for @{version} release</releaseStartMessage>
+                        <releaseFinishMessage>update for next development version @{version}</releaseFinishMessage>
+                    </commitMessages>
                 </configuration>
             </plugin>