diff --git a/.mailmap b/.mailmap
index fcc5365b863..de40453e677 100644
--- a/.mailmap
+++ b/.mailmap
@@ -112,12 +112,12 @@ Furkan Bicak <bicak.cs@subutai.io> Furkan Bicak <bicak.cs@safehaus.org>
 Furkan Bicak <bicak.cs@subutai.io> Furkan Bıçak <bicak.cs@gmail.com>
 Furkan Bicak <bicak.cs@subutai.io> Furkan Bıçak <fbicak@havelsan.com.tr>
 
-Ilarion (Larik) Stus <istus@optdyn.com> Ilarion Stus <istus@critical-factor.com>
-Ilarion (Larik) Stus <istus@optdyn.com> istus <istus@mail.critical-factor.com>
-Ilarion (Larik) Stus <istus@optdyn.com> Larik <larensolarsuss@gmail.com>
-Ilarion (Larik) Stus <istus@optdyn.com> ubuntu <larensolarsuss@gmail.com>
-Ilarion (Larik) Stus <istus@optdyn.com> larenso <istuts@optimal-dynamics.com>
-Ilarion (Larik) Stus <istus@optdyn.com> larenso <larensolarsuss@gmail.com>
+Ilarion Stus <istus@optdyn.com> Ilarion Stus <istus@critical-factor.com>
+Ilarion Stus <istus@optdyn.com> istus <istus@mail.critical-factor.com>
+Ilarion Stus <istus@optdyn.com> Larik <larensolarsuss@gmail.com>
+Ilarion Stus <istus@optdyn.com> ubuntu <larensolarsuss@gmail.com>
+Ilarion Stus <istus@optdyn.com> larenso <istuts@optimal-dynamics.com>
+Ilarion Stus <istus@optdyn.com> larenso <larensolarsuss@gmail.com>
 
 Jenkins Admin <admin@optdyn.com> Jenkins Admin <admin@optimal-dynamics.com>
 
diff --git a/Jenkinsfile b/Jenkinsfile
index a8b92b1187d..f5a711c664e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ try {
         def mvnHome = tool 'M3'
         def workspace = pwd()
 
-        stage("Build management deb package") 
+	    stage("Build management deb package")
         // Use maven to to build deb and template files of management
         notifyBuildDetails = "\nFailed Step - Build management deb package"
 
@@ -42,6 +42,10 @@ try {
         // build deb
         sh """
 		cd management
+
+        set +x
+        set -e
+
         git checkout ${env.BRANCH_NAME}
 		sed 's/export BAZAAR_IP=.*/export BAZAAR_IP=${cdnHost}/g' -i server/server-karaf/src/main/assembly/bin/setenv
 		if [[ "${env.BRANCH_NAME}" == "dev" ]]; then
@@ -77,23 +81,26 @@ try {
                 
         // create management template
 
-            sh """
-		   	set +x
+            sh """	
+	    set +x
+	    
             set -e
 		    sudo sed 's/URL =.*/URL = ${cdnHost}/gI' -i /etc/subutai/agent.conf
             sudo sed 's/SshJumpServer =.*/SshJumpServer = ${jumpServer}/gI' -i /etc/subutai/agent.conf
             set +e
 			sudo subutai destroy management
 			set -e
-            sudo subutai clone debian-stretch:subutai:0.4.5 management
+            sudo subutai clone debian-buster management
 			/bin/sleep 20
 			cp ${workspace}/${debFileName} /var/lib/lxc/management/rootfs/tmp/
 			sudo subutai attach management "apt-get update && apt-get install dirmngr -y"
 			sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1"
+			sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 8AC3B29174885C03"
+			sudo subutai attach management "echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk.list"
 			sudo subutai attach management "echo 'deb http://deb.subutai.io/subutai ${aptRepo} main' > /etc/apt/sources.list.d/subutai-repo.list"
             sudo subutai attach management "apt-get update && apt upgrade -y"
 			sudo subutai attach management "sync"
-			sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs openjdk-8-jre"
+			sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs adoptopenjdk-8-hotspot adoptopenjdk-8-hotspot-jre"
             sudo cp ~/influxdb.conf /var/lib/lxc/management/rootfs/etc/influxdb/influxdb.conf
 			sudo subutai attach management "dpkg -i /tmp/${debFileName}"
 			sudo subutai attach management "systemctl stop management"
diff --git a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java
index 2d62335fa47..21cfe0f2dd6 100644
--- a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java
+++ b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java
@@ -114,6 +114,9 @@ private void handlePortMap( PortMapDto portMapDto )
                 DestroyPortMap destroyPortMap = new DestroyPortMap( ctx );
                 destroyPortMap.deleteMap( portMapDto );
                 break;
+            case RECREATE:
+                recreatePortMap( portMapDto );
+                break;
             case ERROR:
                 break;
             case USED:
@@ -124,6 +127,14 @@ private void handlePortMap( PortMapDto portMapDto )
     }
 
 
+    private void recreatePortMap( PortMapDto portMapDto )
+    {
+        DestroyPortMap destroyPortMap = new DestroyPortMap( ctx );
+        destroyPortMap.deleteMap( portMapDto );
+        createMap( portMapDto );
+    }
+
+
     private void createMap( PortMapDto portMapDto )
     {
         try
diff --git a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java
index d908e9fe187..af33869b1c9 100644
--- a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java
+++ b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java
@@ -23,7 +23,7 @@ public boolean isHttpOrHttps()
 
     public enum State
     {
-        CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED
+        CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED, RECREATE
     }