diff --git a/debian-package/deb-gen b/debian-package/deb-gen
index 2ea9fcd..7d08979 100755
--- a/debian-package/deb-gen
+++ b/debian-package/deb-gen
@@ -1,17 +1,4 @@
 #!/bin/sh
 
-cat <<! > edge-vpnio/DEBIAN/control
-Package: edge-vpnio
-Name: EdgeVPNio
-Version: 20.7
-Maintainer: <ip.over.p2p@gmail.com>
-Architecture: $(dpkg --print-architecture)
-Homepage: http://edgevpnio.github.io
-Depends: python3.8, python3-dev, python3-venv, python3-pip, iproute2, openvswitch-switch, bridge-utils
-Description: Virtual Overlay Networking.
- EdgeVPN is an open-source user-centric software virtual network allowing end users to define and create their own virtual private networks (VPNs). EdgeVPNio virtual networks provide end-to-end tunneling of IP or Ethernet over Tincan links setup and managed through a control API to create various software-defined VPN overlays.
-Tag: P2P Overlay Networking
-!
-
 dpkg-deb --build --root-owner-group edge-vpnio .
-rm -f edge-vpnio/DEBIAN/control
+rm -f edge-vpnio/DEBIAN/control
\ No newline at end of file
diff --git a/debian-package/debian-config b/debian-package/debian-config
new file mode 100644
index 0000000..6c510eb
--- /dev/null
+++ b/debian-package/debian-config
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+type <<! > edge-vpnio/DEBIAN/control
+Package: edge-vpnio
+Name: EdgeVPNio
+Version : 20.10.0.1604343933-dev
+Maintainer: <ip.over.p2p@gmail.com>
+Architecture: $(dpkg --print-architecture)
+Homepage: http://edgevpnio.github.io
+Depends: python3.8, python3-dev, python3-venv, python3-pip, iproute2, openvswitch-switch, bridge-utils
+Description: Virtual Overlay Networking.
+ EdgeVPN is an open-source user-centric software virtual network allowing end users to define and create their own virtual private networks (VPNs). EdgeVPNio virtual networks provide end-to-end tunneling of IP or Ethernet over Tincan links setup and managed through a control API to create various software-defined VPN overlays.
+Tag: P2P Overlay Networking
+!
\ No newline at end of file
diff --git a/scripts/Versioning.py b/scripts/Versioning.py
index 6a9e5ed..6402fa3 100644
--- a/scripts/Versioning.py
+++ b/scripts/Versioning.py
@@ -1,5 +1,6 @@
 import os
 import time
+import subprocess
 import fileinput
 import sys
 from scripts.tool_config import CONTROL_VER as control
@@ -23,8 +24,8 @@ class Versioning:
 
         wd = os.getcwd()
         location1 = "~/workspace/EdgeVPNIO/evio/tincan/trunk/include/tincan_version.h"
-        #location = '.'
-        os.chdir(location1)
+        location = '.'
+        os.chdir(location)
         # version_h_r = open("tincan_version.h", 'r').read()
         # version_h_w = open("tincan_version.h", 'w')
         # m = version_h_r.replace("static const uint16_t kTincanVerMjr = 0;", "static const uint16_t kTincanVerMjr = " + major + ";")
@@ -96,17 +97,25 @@ class Versioning:
             c_file.write("EVIO_VER_BLD = " + str(build) + "\n")
             c_file.write("EVIO_VER_CTL = " + str(control) + "\n")
         os.replace('Version.py', location2)
-        os.chdir(wd)
         os.chdir("../debian-package")
-        for line in fileinput.input('./deb-gen', inplace=True):
+        # for line in fileinput.input('./deb-gen', inplace=True):
+        #     if line.strip().startswith('Version'):
+        #         if official:
+        #             line = 'Version : ' + ver + '\n'
+        #         else:
+        #             line = 'Version : ' + ver + '-dev\n'
+        #     sys.stdout.write(line)
+        subprocess.run("./debian-config")
+        for line in fileinput.input('./edge-vpnio/DEBIAN/control', inplace=True):
             if line.strip().startswith('Version'):
                 if official:
                     line = 'Version : ' + ver + '\n'
                 else:
                     line = 'Version : ' + ver + '-dev\n'
             sys.stdout.write(line)
-    #os.replace('./temp', './deb-gen')
-        # os.rename(r'./temp', r'./deb-gen')
+            os.chdir(wd)
+    # os.replace('./temp', './deb-gen')
+    # os.rename(r'./temp', r'./deb-gen')
 
 
 if __name__ == '__main__':
diff --git a/scripts/evtool-v20.7.2 b/scripts/evtool-v20.7.2
index f65cf26..0c8a9e1 100755
--- a/scripts/evtool-v20.7.2
+++ b/scripts/evtool-v20.7.2
@@ -98,8 +98,13 @@ function make_dkrimg
   mkdir -p ~/workspace/out/docker-image
   cd ~/workspace/$EdgeVPNIO/tools
   mv ../../out/debian-package/edge-vpnio_20.7_amd64.deb docker-image/  && \
+  wd=$(pwd)
+  cd ../../out/debian-package/
+  NAME=`ls | grep *.deb`
+  version=$(echo $NAME | cut -d_ -f2)
+  cd $wd
     docker build -f ./docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.0 ../../out/docker-image && \
-    docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:20.7.3 ../../out/docker-image
+    docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:"$version" ../../out/docker-image
     
 }