diff --git a/bin/get_plat_tag.sh b/bin/get_plat_tag.sh
index 9c58110..2f098e3 100755
--- a/bin/get_plat_tag.sh
+++ b/bin/get_plat_tag.sh
@@ -140,6 +140,10 @@ if [ -f /etc/lsb-release ]; then
       echo "16${i}"
       exit 0
     fi
+    if [ "$RELEASE" = "bionic" ]; then
+      echo "18${i}"
+      exit 0
+    fi
     echo "UNKNOWN${i}"
     exit 0
   fi
diff --git a/def/package-RHEL.def b/def/package-RHEL.def
index b017f03..4a757ac 100644
--- a/def/package-RHEL.def
+++ b/def/package-RHEL.def
@@ -2,3 +2,5 @@ include $(DEF_ROOT)/package-rpm.def
 
 PKG_APPEND.RHEL7_64 = .el7
 PKG_APPEND.RHEL6_64 = .el6
+PKG_OS_TAG.RHEL7_64 = r7
+PKG_OS_TAG.RHEL6_64 = r6
diff --git a/def/package-UBUNTU.def b/def/package-UBUNTU.def
index 42c6913..3c0d383 100644
--- a/def/package-UBUNTU.def
+++ b/def/package-UBUNTU.def
@@ -1,5 +1,10 @@
 include $(DEF_ROOT)/package-deb.def
 
+PKG_APPEND.UBUNTU18_64 := .18.04
 PKG_APPEND.UBUNTU16_64 := .16.04
 PKG_APPEND.UBUNTU14_64 := .14.04
 PKG_APPEND.UBUNTU12_64 := .12.04
+PKG_OS_TAG.UBUNTU18_64 := u18
+PKG_OS_TAG.UBUNTU16_64 := u16
+PKG_OS_TAG.UBUNTU14_64 := u14
+PKG_OS_TAG.UBUNTU12_64 := u12
diff --git a/def/package-deb.def b/def/package-deb.def
index 1d8b09b..8fec5ad 100644
--- a/def/package-deb.def
+++ b/def/package-deb.def
@@ -1,6 +1,6 @@
 PKG_EXT := deb
 
-PKG_BUILD := dpkg-buildpackage -irpm
+PKG_BUILD := dpkg-buildpackage -irpm -us -uc
 PKG_EXTRACT := sudo apt-get --assume-yes --verbose-versions install
 PKG_PURGE := sudo apt-get --assume-yes --purge purge
 PKG_DEV := dev
diff --git a/def/package.def b/def/package.def
index 13ef7d8..9e5b58d 100644
--- a/def/package.def
+++ b/def/package.def
@@ -53,6 +53,7 @@ PKG_ITERATION = 1$(PKG_REVISION)
 # - PKG_DEV
 # - PKG_LIB
 # - PKG_APPEND
+# - PKG_OS_TAG
 BUILD_DISTRIBUTION := $(shell $(SED) -e 's/[0-9]*_[0-9]*$$//' <<< $(BUILD_PLATFORM))
 ifneq ($(wildcard $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def), )
 	include $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def
@@ -60,6 +61,7 @@ else
 	include $(error unsupported BUILD_PLATFORM $(BUILD_PLATFORM))
 endif
 PKG_APPEND ?= $(PKG_APPEND.$(BUILD_PLATFORM))
+PKG_OS_TAG ?= $(PKG_OS_TAG.$(BUILD_PLATFORM))
 
 # Platform specific package overrides
 ifneq ($(wildcard $(BUILD_DISTRIBUTION).def), )
@@ -78,9 +80,9 @@ define generic-clean
   $(RM) -rf $(PLATFORM_DIR)
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
+# $pkg.spec OR $pkg/debian/{changelog,*.shlibs,control}
 define replace-pkginfo
-  $(PERL) -pi -e 's|VERSION|$(pvers)|; s|ITERATION|$(PKG_ITERATION)|; s|ZAPPEND|$(PKG_APPEND)|'
+  $(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
 endef
 
 # $pkg.spec OR $pkg/debian/rules
@@ -93,7 +95,7 @@ define replace-dictinfo
   $(PERL) -pi -e 's/ADICT/$(dictver)/g;'
 endef
 
-# $pkg.spec OR $pkg/debian/{changelog, control, copyright, watch}
+# $pkg.spec OR $pkg/debian/{changelog,control,copyright,watch}
 define replace-perl-modinfo
   $(PERL) -pi -e 's/MODNAME/$(pname)/g; s/MODNORMNAME/$(pname_lc)/g;'
 endef