diff --git a/application/pom.xml b/application/pom.xml
index 57881fb7d2..15d1d314dc 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -34,10 +34,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/..</main.dir>
+        <pkg.type>java</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>thingsboard</pkg.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
+        <pkg.copyInstallScripts>true</pkg.copyInstallScripts>
+        <pkg.implementationTitle>ThingsBoard</pkg.implementationTitle>
+        <pkg.mainClass>org.thingsboard.server.ThingsboardServerApplication</pkg.mainClass>
     </properties>
 
     <dependencies>
@@ -307,6 +312,10 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -323,313 +332,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-service-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <excludes>
-                                        <exclude>thingsboard.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-install</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/bin/install</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/install</directory>
-                                    <includes>
-                                        <include>**/*.sh</include>
-                                        <include>**/*.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-install</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/install</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/install</directory>
-                                    <includes>
-                                        <include>logback.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-data</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/data</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/data</directory>
-                                </resource>
-                                <resource>
-                                    <directory>../dao/src/main/resources</directory>
-                                    <includes>
-                                        <include>**/*.cql</include>
-                                        <include>**/*.sql</include>
-                                    </includes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-winsw-service</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.sun.winsw</groupId>
-                                    <artifactId>winsw</artifactId>
-                                    <classifier>bin</classifier>
-                                    <type>exe</type>
-                                    <destFileName>service.exe</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/logback.xml</exclude>
-                    </excludes>
-                    <archive>
-                        <manifestEntries>
-                            <Implementation-Title>ThingsBoard</Implementation-Title>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.thingsboard.server.ThingsboardServerApplication</mainClass>
-                    <classifier>boot</classifier>
-                    <layout>ZIP</layout>
-                    <executable>true</executable>
-                    <excludeDevtools>true</excludeDevtools>
-                    <embeddedLaunchScriptProperties>
-                        <confFolder>${pkg.installFolder}/conf</confFolder>
-                        <logFolder>${pkg.unixLogFolder}</logFolder>
-                        <logFilename>${pkg.name}.out</logFilename>
-                        <initInfoProvides>${pkg.name}</initInfoProvides>
-                    </embeddedLaunchScriptProperties>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}
-                        </arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <file>${project.build.directory}/${pkg.name}.deb</file>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <groupId>${project.groupId}</groupId>
-                    <version>${project.version}</version>
-                    <classifier>deb</classifier>
-                    <packaging>deb</packaging>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-deb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
diff --git a/application/src/main/scripts/control/rpm/postinst b/application/src/main/scripts/control/rpm/postinst
deleted file mode 100644
index d8021e2dd9..0000000000
--- a/application/src/main/scripts/control/rpm/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-
-if [ $1 -eq 1 ] ; then
-        # Initial installation
-        systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/msa/js-executor/build.gradle b/msa/js-executor/build.gradle
deleted file mode 100644
index 1c48f3d19f..0000000000
--- a/msa/js-executor/build.gradle
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.tools.ant.filters.ReplaceTokens
-
-buildscript {
-    ext {
-        osPackageVersion = "3.8.0"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
-}
-
-apply plugin: "nebula.ospackage"
-
-buildDir = projectBuildDir
-version = projectVersion
-distsDirName = "./"
-
-// OS Package plugin configuration
-ospackage {
-    packageName = pkgName
-    version = "${project.version}"
-    release = 1
-    os = LINUX
-    type = BINARY
-
-    into pkgInstallFolder
-
-    user pkgUser
-    permissionGroup pkgUser
-
-    // Copy the executable file
-    from("target/package/linux/bin/${pkgName}") {
-        fileMode 0500
-        into "bin"
-    }
-
-    // Copy the init file
-    from("target/package/linux/init/${pkgName}") {
-        fileMode 0500
-        into "init"
-    }
-
-    // Copy the config files
-    from("target/package/linux/conf") {
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "conf"
-    }
-
-}
-
-// Configure our RPM build task
-buildRpm {
-
-    arch = X86_64
-
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
-
-    preInstall file("${buildDir}/control/rpm/preinst")
-    postInstall file("${buildDir}/control/rpm/postinst")
-    preUninstall file("${buildDir}/control/rpm/prerm")
-    postUninstall file("${buildDir}/control/rpm/postrm")
-
-    user pkgUser
-    permissionGroup pkgUser
-
-    // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
-        addParentDirs = false
-        fileMode 0644
-        into "/usr/lib/systemd/system"
-    }
-
-    directory(pkgLogFolder, 0755)
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
-
-// Same as the buildRpm task
-buildDeb {
-
-    arch = "amd64"
-
-    archiveName = "${pkgName}.deb"
-
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
-    configurationFile("${pkgInstallFolder}/conf/custom-environment-variables.yml")
-    configurationFile("${pkgInstallFolder}/conf/default.yml")
-    configurationFile("${pkgInstallFolder}/conf/logger.js")
-
-    preInstall file("${buildDir}/control/deb/preinst")
-    postInstall file("${buildDir}/control/deb/postinst")
-    preUninstall file("${buildDir}/control/deb/prerm")
-    postUninstall file("${buildDir}/control/deb/postrm")
-
-    user pkgUser
-    permissionGroup pkgUser
-
-    directory(pkgLogFolder, 0755)
-    link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/init/${pkgName}")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
diff --git a/msa/js-executor/package-lock.json b/msa/js-executor/package-lock.json
index 324b75a2f7..f2afdf1688 100644
--- a/msa/js-executor/package-lock.json
+++ b/msa/js-executor/package-lock.json
@@ -1461,7 +1461,7 @@
     },
     "enabled": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
       "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
       "requires": {
         "env-variable": "0.0.x"
@@ -1740,7 +1740,7 @@
     },
     "fecha": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+      "resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
       "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
     },
     "file-stream-rotator": {
@@ -1872,14 +1872,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1894,20 +1892,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2024,8 +2019,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2037,7 +2031,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2052,7 +2045,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2164,8 +2156,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2298,7 +2289,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2400,7 +2390,7 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
@@ -2557,7 +2547,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -2889,7 +2879,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -3251,7 +3241,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mixin-deep": {
@@ -3277,7 +3267,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
@@ -3286,7 +3276,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         }
@@ -3550,7 +3540,7 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
@@ -3989,7 +3979,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -4299,7 +4289,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 1797dd3200..3aedead07e 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -34,10 +34,12 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
-        <pkg.name>tb-js-executor</pkg.name>
         <docker.name>tb-js-executor</docker.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
+        <pkg.name>tb-js-executor</pkg.name>
+        <pkg.type>js</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>
         <pkg.win.dist>${project.build.directory}/package/windows</pkg.win.dist>
     </properties>
@@ -87,194 +89,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-winsw-service</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.sun.winsw</groupId>
-                                    <artifactId>winsw</artifactId>
-                                    <classifier>bin</classifier>
-                                    <type>exe</type>
-                                    <destFileName>service.exe</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-linux-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.linux.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>config</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-linux-init</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.linux.dist}/init</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/init</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>config</directory>
-                                    <excludes>
-                                        <exclude>tb-js-executor.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-docker-config</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>docker</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgUser=${pkg.user}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>com.spotify</groupId>
diff --git a/msa/js-executor/src/main/assembly/windows.xml b/msa/js-executor/src/main/assembly/windows.xml
deleted file mode 100644
index 2cf7265fa4..0000000000
--- a/msa/js-executor/src/main/assembly/windows.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
-    Copyright © 2016-2020 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>windows</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!-- Workaround to create logs directory -->
-    <fileSets>
-        <fileSet>
-            <directory>${pkg.win.dist}</directory>
-            <outputDirectory>logs</outputDirectory>
-            <excludes>
-                <exclude>*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${pkg.win.dist}/conf</directory>
-            <outputDirectory>conf</outputDirectory>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${pkg.win.dist}/bin/${pkg.name}.exe</source>
-            <outputDirectory>bin</outputDirectory>
-            <destName>${pkg.name}.exe</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.exe</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.exe</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.xml</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.xml</destName>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/install.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/uninstall.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/msa/js-executor/src/main/scripts/control/deb/postinst b/msa/js-executor/src/main/scripts/control/deb/postinst
deleted file mode 100644
index 0767d3f2c7..0000000000
--- a/msa/js-executor/src/main/scripts/control/deb/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-update-rc.d ${pkg.name} defaults
-
diff --git a/msa/js-executor/src/main/scripts/init/tb-js-executor b/msa/js-executor/src/main/scripts/init/tb-js-executor
deleted file mode 100644
index 6e8fa52cd3..0000000000
--- a/msa/js-executor/src/main/scripts/init/tb-js-executor
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-#
-
-
-### BEGIN INIT INFO
-# Provides:          tb-js-executor
-# Required-Start:    $remote_fs $syslog $network
-# Required-Stop:     $remote_fs $syslog $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: ${project.name}
-# Description:       ${project.description}
-# chkconfig:         2345 99 01
-### END INIT INFO
-
-[[ -n "$DEBUG" ]] && set -x
-
-# Initialize variables that cannot be provided by a .conf file
-WORKING_DIR="$(pwd)"
-# shellcheck disable=SC2153
-
-mainfile=${pkg.installFolder}/bin/${pkg.name}
-configfile=${pkg.name}.conf
-
-# Follow symlinks to find the real script and detect init.d script
-cd "$(dirname "$0")" || exit 1
-[[ -z "$initfile" ]] && initfile=$(pwd)/$(basename "$0")
-while [[ -L "$initfile" ]]; do
-  [[ "$initfile" =~ init\.d ]] && init_script=$(basename "$initfile")
-  initfile=$(readlink "$initfile")
-  cd "$(dirname "$initfile")" || exit 1
-  initfile=$(pwd)/$(basename "$initfile")
-done
-initfolder="$( (cd "$(dirname "initfile")" && pwd -P) )"
-cd "$WORKING_DIR" || exit 1
-
-# Initialize CONF_FOLDER location
-[[ -z "$CONF_FOLDER" ]] && CONF_FOLDER="${pkg.installFolder}/conf"
-
-# shellcheck source=/dev/null
-[[ -r "${CONF_FOLDER}/${configfile}" ]] && source "${CONF_FOLDER}/${configfile}"
-
-# Initialize PID/LOG locations if they weren't provided by the config file
-[[ -z "$PID_FOLDER" ]] && PID_FOLDER="/var/run"
-[[ -z "$LOG_FOLDER" ]] && LOG_FOLDER="${pkg.unixLogFolder}"
-! [[ "$PID_FOLDER" == /* ]] && PID_FOLDER="$(dirname "$mainfile")"/"$PID_FOLDER"
-! [[ "$LOG_FOLDER" == /* ]] && LOG_FOLDER="$(dirname "$mainfile")"/"$LOG_FOLDER"
-! [[ -x "$PID_FOLDER" ]] && PID_FOLDER="/tmp"
-! [[ -x "$LOG_FOLDER" ]] && LOG_FOLDER="/tmp"
-
-# Set up defaults
-[[ -z "$MODE" ]] && MODE="auto" # modes are "auto", "service" or "run"
-[[ -z "$USE_START_STOP_DAEMON" ]] && USE_START_STOP_DAEMON="true"
-
-# Create an identity for log/pid files
-if [[ -z "$identity" ]]; then
-  if [[ -n "$init_script" ]]; then
-    identity="${init_script}"
-  else
-    identity=$(basename "${initfile%.*}")_${initfolder//\//}
-  fi
-fi
-
-# Initialize log file name if not provided by the config file
-[[ -z "$LOG_FILENAME" ]] && LOG_FILENAME="${identity}.log"
-
-# ANSI Colors
-echoRed() { echo $'\e[0;31m'"$1"$'\e[0m'; }
-echoGreen() { echo $'\e[0;32m'"$1"$'\e[0m'; }
-echoYellow() { echo $'\e[0;33m'"$1"$'\e[0m'; }
-
-# Utility functions
-checkPermissions() {
-  touch "$pid_file" &> /dev/null || { echoRed "Operation not permitted (cannot access pid file)"; return 4; }
-  touch "$log_file" &> /dev/null || { echoRed "Operation not permitted (cannot access log file)"; return 4; }
-}
-
-isRunning() {
-  ps -p "$1" &> /dev/null
-}
-
-await_file() {
-  end=$(date +%s)
-  let "end+=10"
-  while [[ ! -s "$1" ]]
-  do
-    now=$(date +%s)
-    if [[ $now -ge $end ]]; then
-      break
-    fi
-    sleep 1
-  done
-}
-
-# Determine the script mode
-action="run"
-if [[ "$MODE" == "auto" && -n "$init_script" ]] || [[ "$MODE" == "service" ]]; then
-  action="$1"
-  shift
-fi
-
-# Build the pid and log filenames
-if [[ "$identity" == "$init_script" ]] || [[ "$identity" == "$APP_NAME" ]]; then
-  PID_FOLDER="$PID_FOLDER/${identity}"
-  pid_subfolder=$PID_FOLDER
-fi
-pid_file="$PID_FOLDER/${identity}.pid"
-log_file="$LOG_FOLDER/$LOG_FILENAME"
-
-# Determine the user to run as if we are root
-# shellcheck disable=SC2012
-[[ $(id -u) == "0" ]] && run_user=$(ls -ld "$mainfile" | awk '{print $3}')
-
-arguments=($RUN_ARGS "$@")
-
-# Action functions
-start() {
-  if [[ -f "$pid_file" ]]; then
-    pid=$(cat "$pid_file")
-    isRunning "$pid" && { echoYellow "Already running [$pid]"; return 0; }
-  fi
-  do_start "$@"
-}
-
-do_start() {
-  working_dir=$(dirname "$mainfile")
-  pushd "$working_dir" > /dev/null
-  mkdir -p "$PID_FOLDER" &> /dev/null
-  if [[ -n "$run_user" ]]; then
-    checkPermissions || return $?
-    if [[ -z "$pid_subfolder" ]]; then
-      chown "$run_user" "$pid_subfolder"
-    fi
-    chown "$run_user" "$pid_file"
-    chown "$run_user" "$log_file"
-    if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then
-      start-stop-daemon --start --quiet \
-        --chuid "$run_user" \
-        --name "$identity" \
-        --make-pidfile --pidfile "$pid_file" \
-        --background --no-close \
-        --startas "$mainfile" \
-        --chdir "$working_dir" \
-        -- "${arguments[@]}" \
-        >> "$log_file" 2>&1
-      await_file "$pid_file"
-    else
-      su -s /bin/sh -c "$mainfile $(printf "\"%s\" " "${arguments[@]}") >> \"$log_file\" 2>&1 & echo \$!" "$run_user" > "$pid_file"
-    fi
-    pid=$(cat "$pid_file")
-  else
-    checkPermissions || return $?
-    "$mainfile" "${arguments[@]}" >> "$log_file" 2>&1 &
-    pid=$!
-    disown $pid
-    echo "$pid" > "$pid_file"
-  fi
-  [[ -z $pid ]] && { echoRed "Failed to start"; return 1; }
-  echoGreen "Started [$pid]"
-}
-
-stop() {
-  working_dir=$(dirname "$mainfile")
-  pushd "$working_dir" > /dev/null
-  [[ -f $pid_file ]] || { echoYellow "Not running (pidfile not found)"; return 0; }
-  pid=$(cat "$pid_file")
-  isRunning "$pid" || { echoYellow "Not running (process ${pid}). Removing stale pid file."; rm -f "$pid_file"; return 0; }
-  do_stop "$pid" "$pid_file"
-}
-
-do_stop() {
-  kill -2 "$1" &> /dev/null || { echoRed "Unable to kill process $1"; return 1; }
-  for i in $(seq 1 60); do
-    isRunning "$1" || { echoGreen "Stopped [$1]"; rm -f "$2"; return 0; }
-    [[ $i -eq 30 ]] && kill -9 "$1" &> /dev/null
-    sleep 1
-  done
-  echoRed "Unable to kill process $1";
-  return 1;
-}
-
-restart() {
-  stop && start
-}
-
-orce_reload() {
-  working_dir=$(dirname "$mainfile")
-  pushd "$working_dir" > /dev/null
-  [[ -f $pid_file ]] || { echoRed "Not running (pidfile not found)"; return 7; }
-  pid=$(cat "$pid_file")
-  rm -f "$pid_file"
-  isRunning "$pid" || { echoRed "Not running (process ${pid} not found)"; return 7; }
-  do_stop "$pid" "$pid_file"
-  do_start
-}
-
-status() {
-  working_dir=$(dirname "$mainfile")
-  pushd "$working_dir" > /dev/null
-  [[ -f "$pid_file" ]] || { echoRed "Not running"; return 3; }
-  pid=$(cat "$pid_file")
-  isRunning "$pid" || { echoRed "Not running (process ${pid} not found)"; return 1; }
-  echoGreen "Running [$pid]"
-  return 0
-}
-
-run() {
-  pushd "$(dirname "$mainfile")" > /dev/null
-  "$mainfile" "${arguments[@]}"
-  result=$?
-  popd > /dev/null
-  return "$result"
-}
-
-# Call the appropriate action function
-case "$action" in
-start)
-  start "$@"; exit $?;;
-stop)
-  stop "$@"; exit $?;;
-restart)
-  restart "$@"; exit $?;;
-force-reload)
-  force_reload "$@"; exit $?;;
-status)
-  status "$@"; exit $?;;
-run)
-  run "$@"; exit $?;;
-*)
-  echo "Usage: $0 {start|stop|restart|force-reload|status|run}"; exit 1;
-esac
-
-exit 0
diff --git a/msa/js-executor/src/main/scripts/windows/service.xml b/msa/js-executor/src/main/scripts/windows/service.xml
deleted file mode 100644
index bb91111586..0000000000
--- a/msa/js-executor/src/main/scripts/windows/service.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-
-    Copyright © 2016-2018 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<service>
-    <id>${pkg.name}</id>
-    <name>${project.name}</name>
-    <description>${project.description}</description>
-    <workingdirectory>%BASE%\bin</workingdirectory>
-    <logpath>${pkg.winWrapperLogFolder}</logpath>
-    <logmode>rotate</logmode>
-    <env name="NODE_CONFIG_DIR" value="%BASE%\conf" />
-    <env name="LOG_FOLDER" value="${pkg.winWrapperLogFolder}" />
-    <env name="NODE_ENV" value="production" />
-    <executable>%BASE%\bin\${pkg.name}.exe</executable>
-</service>
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index 47d1f5914e..853dd6e3ad 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -35,9 +35,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.name>tb-web-ui</pkg.name>
+        <pkg.type>js</pkg.type>
         <docker.name>tb-web-ui</docker.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
+        <pkg.name>tb-web-ui</pkg.name>
+        <pkg.type>js</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>
         <pkg.win.dist>${project.build.directory}/package/windows</pkg.win.dist>
     </properties>
@@ -133,173 +137,192 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-linux-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.linux.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>config</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-linux-init</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.linux.dist}/init</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/init</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>config</directory>
-                                    <excludes>
-                                        <exclude>tb-web-ui.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-docker-config</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>docker</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgUser=${pkg.user}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-resources-plugin</artifactId>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>copy-linux-conf</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${pkg.linux.dist}/conf</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>config</directory>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                            <filters>-->
+<!--                                <filter>src/main/filters/unix.properties</filter>-->
+<!--                            </filters>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>copy-linux-init</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${pkg.linux.dist}/init</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>src/main/scripts/init</directory>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                            <filters>-->
+<!--                                <filter>src/main/filters/unix.properties</filter>-->
+<!--                            </filters>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>copy-win-conf</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>config</directory>-->
+<!--                                    <excludes>-->
+<!--                                        <exclude>tb-web-ui.conf</exclude>-->
+<!--                                    </excludes>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                            <filters>-->
+<!--                                <filter>src/main/filters/windows.properties</filter>-->
+<!--                            </filters>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>copy-control</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${project.build.directory}/control</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>src/main/scripts/control</directory>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                            <filters>-->
+<!--                                <filter>src/main/filters/unix.properties</filter>-->
+<!--                            </filters>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>copy-windows-control</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${pkg.win.dist}</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>src/main/scripts/windows</directory>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                            <filters>-->
+<!--                                <filter>src/main/filters/windows.properties</filter>-->
+<!--                            </filters>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>copy-docker-config</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>${project.build.directory}</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>docker</directory>-->
+<!--                                    <filtering>true</filtering>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.thingsboard</groupId>-->
+<!--                <artifactId>gradle-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <gradleProjectDirectory>${basedir}</gradleProjectDirectory>-->
+<!--                    <tasks>-->
+<!--                        <task>build</task>-->
+<!--                        <task>buildDeb</task>-->
+<!--                        <task>buildRpm</task>-->
+<!--                        <task>renameDeb</task>-->
+<!--                        <task>renameRpm</task>-->
+<!--                    </tasks>-->
+<!--                    <args>-->
+<!--                        <arg>-PprojectBuildDir=${project.build.directory}</arg>-->
+<!--                        <arg>-PprojectVersion=${project.version}</arg>-->
+<!--                        <arg>-PpkgName=${pkg.name}</arg>-->
+<!--                        <arg>-PpkgUser=${pkg.user}</arg>-->
+<!--                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>-->
+<!--                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>-->
+<!--                    </args>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>invoke</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-assembly-plugin</artifactId>-->
+<!--                <version>3.0.0</version>-->
+<!--                <configuration>-->
+<!--                    <finalName>${pkg.name}</finalName>-->
+<!--                    <descriptors>-->
+<!--                        <descriptor>../../packaging/js/assembly/windows.xml</descriptor>-->
+<!--                    </descriptors>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>assembly</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>single</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
diff --git a/msa/web-ui/src/main/filters/unix.properties b/msa/web-ui/src/main/filters/unix.properties
deleted file mode 100644
index 8967278673..0000000000
--- a/msa/web-ui/src/main/filters/unix.properties
+++ /dev/null
@@ -1 +0,0 @@
-pkg.logFolder=${pkg.unixLogFolder}
\ No newline at end of file
diff --git a/msa/web-ui/src/main/filters/windows.properties b/msa/web-ui/src/main/filters/windows.properties
deleted file mode 100644
index a6e48d91ba..0000000000
--- a/msa/web-ui/src/main/filters/windows.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pkg.logFolder=${BASE}\\logs
-pkg.winWrapperLogFolder=%BASE%\\logs
diff --git a/msa/web-ui/src/main/scripts/control/deb/postinst b/msa/web-ui/src/main/scripts/control/deb/postinst
deleted file mode 100644
index 0767d3f2c7..0000000000
--- a/msa/web-ui/src/main/scripts/control/deb/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-update-rc.d ${pkg.name} defaults
-
diff --git a/msa/web-ui/src/main/scripts/control/deb/postrm b/msa/web-ui/src/main/scripts/control/deb/postrm
deleted file mode 100644
index 61865803c3..0000000000
--- a/msa/web-ui/src/main/scripts/control/deb/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-rc.d -f ${pkg.name} remove
diff --git a/msa/web-ui/src/main/scripts/control/deb/preinst b/msa/web-ui/src/main/scripts/control/deb/preinst
deleted file mode 100644
index d2ebea46d7..0000000000
--- a/msa/web-ui/src/main/scripts/control/deb/preinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if ! getent group ${pkg.user} >/dev/null; then
-    addgroup --system ${pkg.user}
-fi
-
-if ! getent passwd ${pkg.user} >/dev/null; then
-    adduser --quiet \
-            --system \
-            --ingroup ${pkg.user} \
-            --quiet \
-            --disabled-login \
-            --disabled-password \
-            --home ${pkg.installFolder} \
-            --no-create-home \
-            -gecos "Thingsboard application" \
-            ${pkg.user}
-fi
diff --git a/msa/web-ui/src/main/scripts/control/deb/prerm b/msa/web-ui/src/main/scripts/control/deb/prerm
deleted file mode 100644
index 898d3efd5c..0000000000
--- a/msa/web-ui/src/main/scripts/control/deb/prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e /var/run/${pkg.name}/${pkg.name}.pid ]; then
-    service ${pkg.name} stop
-fi
diff --git a/msa/web-ui/src/main/scripts/control/rpm/postinst b/msa/web-ui/src/main/scripts/control/rpm/postinst
deleted file mode 100644
index d8021e2dd9..0000000000
--- a/msa/web-ui/src/main/scripts/control/rpm/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-
-if [ $1 -eq 1 ] ; then
-        # Initial installation
-        systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/msa/web-ui/src/main/scripts/control/rpm/postrm b/msa/web-ui/src/main/scripts/control/rpm/postrm
deleted file mode 100644
index 8e1f8a2048..0000000000
--- a/msa/web-ui/src/main/scripts/control/rpm/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        systemctl try-restart ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/msa/web-ui/src/main/scripts/control/rpm/preinst b/msa/web-ui/src/main/scripts/control/rpm/preinst
deleted file mode 100644
index db6306e4ac..0000000000
--- a/msa/web-ui/src/main/scripts/control/rpm/preinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
--c "Thingsboard application"
diff --git a/msa/web-ui/src/main/scripts/control/rpm/prerm b/msa/web-ui/src/main/scripts/control/rpm/prerm
deleted file mode 100644
index accb487b8e..0000000000
--- a/msa/web-ui/src/main/scripts/control/rpm/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-fi
diff --git a/msa/web-ui/src/main/scripts/control/tb-web-ui.service b/msa/web-ui/src/main/scripts/control/tb-web-ui.service
deleted file mode 100644
index f542dd0f92..0000000000
--- a/msa/web-ui/src/main/scripts/control/tb-web-ui.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=${pkg.name}
-After=syslog.target
-
-[Service]
-User=${pkg.user}
-ExecStart=${pkg.installFolder}/init/${pkg.name}
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/msa/web-ui/src/main/scripts/windows/install.bat b/msa/web-ui/src/main/scripts/windows/install.bat
deleted file mode 100644
index 9f257eba79..0000000000
--- a/msa/web-ui/src/main/scripts/windows/install.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@REM
-@REM Copyright © 2016-2018 The Thingsboard Authors
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM     http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-@ECHO OFF
-
-setlocal ENABLEEXTENSIONS
-
-@ECHO Installing ${pkg.name} ...
-
-SET BASE=%~dp0
-
-"%BASE%"${pkg.name}.exe install
-
-@ECHO ${pkg.name} installed successfully!
-
-GOTO END
-
-:END
diff --git a/msa/web-ui/src/main/scripts/windows/uninstall.bat b/msa/web-ui/src/main/scripts/windows/uninstall.bat
deleted file mode 100644
index 6d6f5be1b4..0000000000
--- a/msa/web-ui/src/main/scripts/windows/uninstall.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@REM
-@REM Copyright © 2016-2018 The Thingsboard Authors
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM     http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-@ECHO OFF
-
-@ECHO Stopping ${pkg.name} ...
-net stop ${pkg.name}
-
-@ECHO Uninstalling ${pkg.name} ...
-"%~dp0"${pkg.name}.exe uninstall
-
-@ECHO DONE.
\ No newline at end of file
diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index f36e8648c8..5b77fce18e 100644
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@@ -22,7 +22,6 @@
         <version>2.5.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
-    <groupId>org.thingsboard</groupId>
     <artifactId>netty-mqtt</artifactId>
     <version>2.5.1-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/application/src/main/assembly/windows.xml b/packaging/java/assembly/windows.xml
similarity index 100%
rename from application/src/main/assembly/windows.xml
rename to packaging/java/assembly/windows.xml
diff --git a/application/build.gradle b/packaging/java/build.gradle
similarity index 70%
rename from application/build.gradle
rename to packaging/java/build.gradle
index 1ea603039a..5b1d725e5d 100644
--- a/application/build.gradle
+++ b/packaging/java/build.gradle
@@ -17,7 +17,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
     ext {
-        osPackageVersion = "3.8.0"
+        osPackageVersion = "8.3.0"
     }
     repositories {
         jcenter()
@@ -43,8 +43,8 @@ ospackage {
 
     into pkgInstallFolder
 
-    user pkgName
-    permissionGroup pkgName
+    user pkgUser
+    permissionGroup pkgUser
 
     // Copy the actual .jar file
     from(mainJar) {
@@ -56,23 +56,25 @@ ospackage {
         into "bin"
     }
 
-    // Copy the install files
-    from("target/bin/install/install.sh") {
-        fileMode 0775
-        into "bin/install"
-    }
+    if("${pkgCopyInstallScripts}".equalsIgnoreCase("true")) {
+        // Copy the install files
+        from("${buildDir}/bin/install/install.sh") {
+            fileMode 0775
+            into "bin/install"
+        }
 
-    from("target/bin/install/upgrade.sh") {
-        fileMode 0775
-        into "bin/install"
-    }
+        from("${buildDir}/bin/install/upgrade.sh") {
+            fileMode 0775
+            into "bin/install"
+        }
 
-    from("target/bin/install/logback.xml") {
-        into "bin/install"
+        from("${buildDir}/bin/install/logback.xml") {
+            into "bin/install"
+        }
     }
 
     // Copy the config files
-    from("target/conf") {
+    from("${buildDir}/conf") {
         exclude "${pkgName}.conf"
         fileType CONFIG | NOREPLACE
         fileMode 0754
@@ -80,14 +82,14 @@ ospackage {
     }
 
     // Copy the data files
-    from("target/data") {
+    from("${buildDir}/data") {
         fileType CONFIG | NOREPLACE
         fileMode 0754
         into "data"
     }
 
     // Copy the extensions files
-    from("target/extensions") {
+    from("${buildDir}/extensions") {
         into "extensions"
     }
 }
@@ -97,12 +99,12 @@ buildRpm {
 
     arch = NOARCH
 
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
+    archiveVersion = projectVersion.replace('-', '')
+    archiveFileName = "${pkgName}.rpm"
 
     requires("java-1.8.0")
 
-    from("target/conf") {
+    from("${buildDir}/conf") {
         include "${pkgName}.conf"
         filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
         fileType CONFIG | NOREPLACE
@@ -115,17 +117,19 @@ buildRpm {
     preUninstall file("${buildDir}/control/rpm/prerm")
     postUninstall file("${buildDir}/control/rpm/postrm")
 
-    user pkgName
-    permissionGroup pkgName
+    user pkgUser
+    permissionGroup pkgUser
 
     // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
+    from("${buildDir}/control/template.service") {
         addParentDirs = false
         fileMode 0644
         into "/usr/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
     }
 
-    directory(pkgLogFolder, 0755)
     link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
@@ -135,11 +139,11 @@ buildDeb {
 
     arch = "all"
 
-    archiveName = "${pkgName}.deb"
+    archiveFileName = "${pkgName}.deb"
 
     requires("openjdk-8-jre").or("java8-runtime").or("oracle-java8-installer").or("openjdk-8-jre-headless")
 
-    from("target/conf") {
+    from("${buildDir}/conf") {
         include "${pkgName}.conf"
         filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
         fileType CONFIG | NOREPLACE
@@ -157,18 +161,40 @@ buildDeb {
     preUninstall file("${buildDir}/control/deb/prerm")
     postUninstall file("${buildDir}/control/deb/postrm")
 
-    user pkgName
-    permissionGroup pkgName
+    user pkgUser
+    permissionGroup pkgUser
 
     // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
+    from("${buildDir}/control/template.service") {
         addParentDirs = false
         fileMode 0644
         into "/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
     }
 
-    directory(pkgLogFolder, 0755)
     link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
     link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
+
+task renameDeb(type: Copy) {
+    from("${buildDir}/") {
+        include '*.deb'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.deb"
+        }
+    }
+}
+
+task renameRpm(type: Copy) {
+    from("${buildDir}/") {
+        include '*.rpm'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.rpm"
+        }
+    }
+}
diff --git a/application/src/main/filters/unix.properties b/packaging/java/filters/unix.properties
similarity index 100%
rename from application/src/main/filters/unix.properties
rename to packaging/java/filters/unix.properties
diff --git a/application/src/main/filters/windows.properties b/packaging/java/filters/windows.properties
similarity index 100%
rename from application/src/main/filters/windows.properties
rename to packaging/java/filters/windows.properties
diff --git a/application/src/main/scripts/control/deb/postinst b/packaging/java/scripts/control/deb/postinst
similarity index 84%
rename from application/src/main/scripts/control/deb/postinst
rename to packaging/java/scripts/control/deb/postinst
index b59dff9252..d69589beea 100644
--- a/application/src/main/scripts/control/deb/postinst
+++ b/packaging/java/scripts/control/deb/postinst
@@ -2,6 +2,7 @@
 
 set -e
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :
diff --git a/application/src/main/scripts/control/deb/postrm b/packaging/java/scripts/control/deb/postrm
similarity index 100%
rename from application/src/main/scripts/control/deb/postrm
rename to packaging/java/scripts/control/deb/postrm
diff --git a/application/src/main/scripts/control/deb/preinst b/packaging/java/scripts/control/deb/preinst
similarity index 100%
rename from application/src/main/scripts/control/deb/preinst
rename to packaging/java/scripts/control/deb/preinst
diff --git a/application/src/main/scripts/control/deb/prerm b/packaging/java/scripts/control/deb/prerm
similarity index 100%
rename from application/src/main/scripts/control/deb/prerm
rename to packaging/java/scripts/control/deb/prerm
diff --git a/transport/coap/src/main/scripts/control/rpm/postinst b/packaging/java/scripts/control/rpm/postinst
similarity index 87%
rename from transport/coap/src/main/scripts/control/rpm/postinst
rename to packaging/java/scripts/control/rpm/postinst
index d8021e2dd9..3608d09ef9 100644
--- a/transport/coap/src/main/scripts/control/rpm/postinst
+++ b/packaging/java/scripts/control/rpm/postinst
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 
diff --git a/application/src/main/scripts/control/rpm/postrm b/packaging/java/scripts/control/rpm/postrm
similarity index 100%
rename from application/src/main/scripts/control/rpm/postrm
rename to packaging/java/scripts/control/rpm/postrm
diff --git a/application/src/main/scripts/control/rpm/preinst b/packaging/java/scripts/control/rpm/preinst
similarity index 100%
rename from application/src/main/scripts/control/rpm/preinst
rename to packaging/java/scripts/control/rpm/preinst
diff --git a/application/src/main/scripts/control/rpm/prerm b/packaging/java/scripts/control/rpm/prerm
similarity index 100%
rename from application/src/main/scripts/control/rpm/prerm
rename to packaging/java/scripts/control/rpm/prerm
diff --git a/application/src/main/scripts/control/thingsboard.service b/packaging/java/scripts/control/template.service
similarity index 100%
rename from application/src/main/scripts/control/thingsboard.service
rename to packaging/java/scripts/control/template.service
diff --git a/application/src/main/scripts/install/install.sh b/packaging/java/scripts/install/install.sh
similarity index 100%
rename from application/src/main/scripts/install/install.sh
rename to packaging/java/scripts/install/install.sh
diff --git a/application/src/main/scripts/install/install_dev_db.sh b/packaging/java/scripts/install/install_dev_db.sh
similarity index 100%
rename from application/src/main/scripts/install/install_dev_db.sh
rename to packaging/java/scripts/install/install_dev_db.sh
diff --git a/application/src/main/scripts/install/logback.xml b/packaging/java/scripts/install/logback.xml
similarity index 100%
rename from application/src/main/scripts/install/logback.xml
rename to packaging/java/scripts/install/logback.xml
diff --git a/application/src/main/scripts/install/upgrade.sh b/packaging/java/scripts/install/upgrade.sh
similarity index 100%
rename from application/src/main/scripts/install/upgrade.sh
rename to packaging/java/scripts/install/upgrade.sh
diff --git a/application/src/main/scripts/install/upgrade_dev_db.sh b/packaging/java/scripts/install/upgrade_dev_db.sh
similarity index 100%
rename from application/src/main/scripts/install/upgrade_dev_db.sh
rename to packaging/java/scripts/install/upgrade_dev_db.sh
diff --git a/application/src/main/scripts/windows/install.bat b/packaging/java/scripts/windows/install.bat
similarity index 100%
rename from application/src/main/scripts/windows/install.bat
rename to packaging/java/scripts/windows/install.bat
diff --git a/application/src/main/scripts/windows/install_dev_db.bat b/packaging/java/scripts/windows/install_dev_db.bat
similarity index 100%
rename from application/src/main/scripts/windows/install_dev_db.bat
rename to packaging/java/scripts/windows/install_dev_db.bat
diff --git a/application/src/main/scripts/windows/service.xml b/packaging/java/scripts/windows/service.xml
similarity index 100%
rename from application/src/main/scripts/windows/service.xml
rename to packaging/java/scripts/windows/service.xml
diff --git a/application/src/main/scripts/windows/uninstall.bat b/packaging/java/scripts/windows/uninstall.bat
similarity index 100%
rename from application/src/main/scripts/windows/uninstall.bat
rename to packaging/java/scripts/windows/uninstall.bat
diff --git a/application/src/main/scripts/windows/upgrade.bat b/packaging/java/scripts/windows/upgrade.bat
similarity index 100%
rename from application/src/main/scripts/windows/upgrade.bat
rename to packaging/java/scripts/windows/upgrade.bat
diff --git a/msa/web-ui/src/main/assembly/windows.xml b/packaging/js/assembly/windows.xml
similarity index 100%
rename from msa/web-ui/src/main/assembly/windows.xml
rename to packaging/js/assembly/windows.xml
diff --git a/msa/web-ui/build.gradle b/packaging/js/build.gradle
similarity index 77%
rename from msa/web-ui/build.gradle
rename to packaging/js/build.gradle
index c436e8305f..34399ae5ea 100644
--- a/msa/web-ui/build.gradle
+++ b/packaging/js/build.gradle
@@ -17,7 +17,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
     ext {
-        osPackageVersion = "3.8.0"
+        osPackageVersion = "8.3.0"
     }
     repositories {
         jcenter()
@@ -47,26 +47,29 @@ ospackage {
     permissionGroup pkgUser
 
     // Copy the executable file
-    from("target/package/linux/bin/${pkgName}") {
+    from("${buildDir}/package/linux/bin/${pkgName}") {
         fileMode 0500
         into "bin"
     }
 
     // Copy the init file
-    from("target/package/linux/init/${pkgName}") {
+    from("${buildDir}/package/linux/init/template") {
         fileMode 0500
         into "init"
+        rename { String filename ->
+            "${pkgName}"
+        }
     }
 
     // Copy the config files
-    from("target/package/linux/conf") {
+    from("${buildDir}/package/linux/conf") {
         fileType CONFIG | NOREPLACE
         fileMode 0754
         into "conf"
     }
 
     // Copy web files
-    from("target/web") {
+    from("${buildDir}/web") {
         into "web"
     }
 
@@ -77,8 +80,8 @@ buildRpm {
 
     arch = X86_64
 
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
+    archiveVersion = projectVersion.replace('-', '')
+    archiveFileName = "${pkgName}.rpm"
 
     preInstall file("${buildDir}/control/rpm/preinst")
     postInstall file("${buildDir}/control/rpm/postinst")
@@ -95,7 +98,6 @@ buildRpm {
         into "/usr/lib/systemd/system"
     }
 
-    directory(pkgLogFolder, 0755)
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
 
@@ -104,7 +106,7 @@ buildDeb {
 
     arch = "amd64"
 
-    archiveName = "${pkgName}.deb"
+    archiveFileName = "${pkgName}.deb"
 
     configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
     configurationFile("${pkgInstallFolder}/conf/custom-environment-variables.yml")
@@ -119,7 +121,26 @@ buildDeb {
     user pkgUser
     permissionGroup pkgUser
 
-    directory(pkgLogFolder, 0755)
     link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/init/${pkgName}")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
+
+task renameDeb(type: Copy) {
+    from("${buildDir}/") {
+        include '*.deb'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.deb"
+        }
+    }
+}
+
+task renameRpm(type: Copy) {
+    from("${buildDir}/") {
+        include '*.rpm'
+        destinationDir file("${buildDir}/")
+        rename { String filename ->
+            "${pkgName}.rpm"
+        }
+    }
+}
diff --git a/msa/js-executor/src/main/filters/unix.properties b/packaging/js/filters/unix.properties
similarity index 100%
rename from msa/js-executor/src/main/filters/unix.properties
rename to packaging/js/filters/unix.properties
diff --git a/msa/js-executor/src/main/filters/windows.properties b/packaging/js/filters/windows.properties
similarity index 100%
rename from msa/js-executor/src/main/filters/windows.properties
rename to packaging/js/filters/windows.properties
diff --git a/transport/http/src/main/scripts/control/deb/postinst b/packaging/js/scripts/control/deb/postinst
similarity index 78%
rename from transport/http/src/main/scripts/control/deb/postinst
rename to packaging/js/scripts/control/deb/postinst
index 0767d3f2c7..729676a8ee 100644
--- a/transport/http/src/main/scripts/control/deb/postinst
+++ b/packaging/js/scripts/control/deb/postinst
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 update-rc.d ${pkg.name} defaults
diff --git a/msa/js-executor/src/main/scripts/control/deb/postrm b/packaging/js/scripts/control/deb/postrm
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/deb/postrm
rename to packaging/js/scripts/control/deb/postrm
diff --git a/msa/js-executor/src/main/scripts/control/deb/preinst b/packaging/js/scripts/control/deb/preinst
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/deb/preinst
rename to packaging/js/scripts/control/deb/preinst
diff --git a/msa/js-executor/src/main/scripts/control/deb/prerm b/packaging/js/scripts/control/deb/prerm
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/deb/prerm
rename to packaging/js/scripts/control/deb/prerm
diff --git a/msa/js-executor/src/main/scripts/control/rpm/postinst b/packaging/js/scripts/control/rpm/postinst
similarity index 87%
rename from msa/js-executor/src/main/scripts/control/rpm/postinst
rename to packaging/js/scripts/control/rpm/postinst
index d8021e2dd9..3608d09ef9 100644
--- a/msa/js-executor/src/main/scripts/control/rpm/postinst
+++ b/packaging/js/scripts/control/rpm/postinst
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+mkdir -m 0755 -p ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.logFolder}
 chown -R ${pkg.user}: ${pkg.installFolder}
 
diff --git a/msa/js-executor/src/main/scripts/control/rpm/postrm b/packaging/js/scripts/control/rpm/postrm
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/rpm/postrm
rename to packaging/js/scripts/control/rpm/postrm
diff --git a/msa/js-executor/src/main/scripts/control/rpm/preinst b/packaging/js/scripts/control/rpm/preinst
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/rpm/preinst
rename to packaging/js/scripts/control/rpm/preinst
diff --git a/msa/js-executor/src/main/scripts/control/rpm/prerm b/packaging/js/scripts/control/rpm/prerm
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/rpm/prerm
rename to packaging/js/scripts/control/rpm/prerm
diff --git a/msa/js-executor/src/main/scripts/control/tb-js-executor.service b/packaging/js/scripts/control/template.service
similarity index 100%
rename from msa/js-executor/src/main/scripts/control/tb-js-executor.service
rename to packaging/js/scripts/control/template.service
diff --git a/msa/web-ui/src/main/scripts/init/tb-web-ui b/packaging/js/scripts/init/template
similarity index 99%
rename from msa/web-ui/src/main/scripts/init/tb-web-ui
rename to packaging/js/scripts/init/template
index d0d3f95fc9..4a8104ae05 100644
--- a/msa/web-ui/src/main/scripts/init/tb-web-ui
+++ b/packaging/js/scripts/init/template
@@ -3,7 +3,7 @@
 
 
 ### BEGIN INIT INFO
-# Provides:          tb-web-ui
+# Provides:          ${pkg.name}
 # Required-Start:    $remote_fs $syslog $network
 # Required-Stop:     $remote_fs $syslog $network
 # Default-Start:     2 3 4 5
diff --git a/msa/js-executor/src/main/scripts/windows/install.bat b/packaging/js/scripts/windows/install.bat
similarity index 100%
rename from msa/js-executor/src/main/scripts/windows/install.bat
rename to packaging/js/scripts/windows/install.bat
diff --git a/msa/web-ui/src/main/scripts/windows/service.xml b/packaging/js/scripts/windows/service.xml
similarity index 100%
rename from msa/web-ui/src/main/scripts/windows/service.xml
rename to packaging/js/scripts/windows/service.xml
diff --git a/msa/js-executor/src/main/scripts/windows/uninstall.bat b/packaging/js/scripts/windows/uninstall.bat
similarity index 100%
rename from msa/js-executor/src/main/scripts/windows/uninstall.bat
rename to packaging/js/scripts/windows/uninstall.bat
diff --git a/pom.xml b/pom.xml
index 9ee07aa9a2..cc81f4b2b6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,13 @@
 
     <properties>
         <main.dir>${basedir}</main.dir>
+        <pkg.disabled>true</pkg.disabled>
+        <pkg.process-resources.phase>none</pkg.process-resources.phase>
+        <pkg.package.phase>none</pkg.package.phase>
         <pkg.user>thingsboard</pkg.user>
+        <pkg.implementationTitle>${project.name}</pkg.implementationTitle>
+        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
+        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version>
         <spring.version>5.2.6.RELEASE</spring.version>
@@ -133,6 +139,394 @@
                 <downloadJavadocs>true</downloadJavadocs>
             </properties>
         </profile>
+
+        <profile>
+            <id>packaging</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-resources-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>copy-conf</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/conf</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>src/main/resources</directory>
+                                                <excludes>
+                                                    <exclude>logback.xml</exclude>
+                                                </excludes>
+                                                <filtering>false</filtering>
+                                            </resource>
+                                        </resources>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-service-conf</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/conf</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>src/main/conf</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/unix.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-linux-conf</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${pkg.linux.dist}/conf</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>config</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/unix.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-linux-init</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${pkg.linux.dist}/init</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>${main.dir}/packaging/${pkg.type}/scripts/init</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/unix.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-win-conf</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>src/main/resources</directory>
+                                                <excludes>
+                                                    <exclude>logback.xml</exclude>
+                                                </excludes>
+                                                <filtering>false</filtering>
+                                            </resource>
+                                            <resource>
+                                                <directory>src/main/conf</directory>
+                                                <excludes>
+                                                    <exclude>${pkg.name}.conf</exclude>
+                                                </excludes>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/windows.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-control</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/control</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>${main.dir}/packaging/${pkg.type}/scripts/control</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/unix.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-install</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/bin/install</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>${main.dir}/packaging/${pkg.type}/scripts/install</directory>
+                                                <includes>
+                                                    <include>**/*.sh</include>
+                                                    <include>**/*.xml</include>
+                                                </includes>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/unix.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-windows-control</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${pkg.win.dist}</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>${main.dir}/packaging/${pkg.type}/scripts/windows</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/windows.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-windows-install</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${pkg.win.dist}/install</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>${main.dir}/packaging/${pkg.type}/scripts/install</directory>
+                                                <includes>
+                                                    <include>logback.xml</include>
+                                                </includes>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                        <filters>
+                                            <filter>${main.dir}/packaging/${pkg.type}/filters/windows.properties</filter>
+                                        </filters>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-data</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}/data</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>src/main/data</directory>
+                                            </resource>
+                                            <resource>
+                                                <directory>../dao/src/main/resources</directory>
+                                                <includes>
+                                                    <include>**/*.cql</include>
+                                                    <include>**/*.sql</include>
+                                                </includes>
+                                                <filtering>false</filtering>
+                                            </resource>
+                                        </resources>
+                                    </configuration>
+                                </execution>
+                                <execution>
+                                    <id>copy-docker-config</id>
+                                    <phase>${pkg.process-resources.phase}</phase>
+                                    <goals>
+                                        <goal>copy-resources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <outputDirectory>${project.build.directory}</outputDirectory>
+                                        <resources>
+                                            <resource>
+                                                <directory>docker</directory>
+                                                <filtering>true</filtering>
+                                            </resource>
+                                        </resources>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-dependency-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>copy-winsw-service</id>
+                                    <phase>${pkg.package.phase}</phase>
+                                    <goals>
+                                        <goal>copy</goal>
+                                    </goals>
+                                    <configuration>
+                                        <artifactItems>
+                                            <artifactItem>
+                                                <groupId>com.sun.winsw</groupId>
+                                                <artifactId>winsw</artifactId>
+                                                <classifier>bin</classifier>
+                                                <type>exe</type>
+                                                <destFileName>service.exe</destFileName>
+                                            </artifactItem>
+                                        </artifactItems>
+                                        <outputDirectory>${pkg.win.dist}</outputDirectory>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-jar-plugin</artifactId>
+                            <configuration>
+                                <excludes>
+                                    <exclude>**/logback.xml</exclude>
+                                </excludes>
+                                <archive>
+                                    <manifestEntries>
+                                        <Implementation-Title>${pkg.implementationTitle}</Implementation-Title>
+                                        <Implementation-Version>${project.version}</Implementation-Version>
+                                    </manifestEntries>
+                                </archive>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-maven-plugin</artifactId>
+                            <configuration>
+                                <skip>${pkg.disabled}</skip>
+                                <mainClass>${pkg.mainClass}</mainClass>
+                                <classifier>boot</classifier>
+                                <layout>ZIP</layout>
+                                <executable>true</executable>
+                                <excludeDevtools>true</excludeDevtools>
+                                <embeddedLaunchScriptProperties>
+                                    <confFolder>${pkg.installFolder}/conf</confFolder>
+                                    <logFolder>${pkg.unixLogFolder}</logFolder>
+                                    <logFilename>${pkg.name}.out</logFilename>
+                                    <initInfoProvides>${pkg.name}</initInfoProvides>
+                                </embeddedLaunchScriptProperties>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <goals>
+                                        <goal>repackage</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.thingsboard</groupId>
+                            <artifactId>gradle-maven-plugin</artifactId>
+                            <configuration>
+                                <gradleProjectDirectory>${main.dir}/packaging/${pkg.type}</gradleProjectDirectory>
+                                <tasks>
+                                    <task>build</task>
+                                    <task>buildDeb</task>
+                                    <task>buildRpm</task>
+                                    <task>renameDeb</task>
+                                    <task>renameRpm</task>
+                                </tasks>
+                                <args>
+                                    <arg>-PpackagingDir=${main.dir}/packaging</arg>
+                                    <arg>-PprojectBuildDir=${basedir}/target</arg>
+                                    <arg>-PprojectVersion=${project.version}</arg>
+                                    <arg>
+                                        -PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}
+                                    </arg>
+                                    <arg>-PpkgName=${pkg.name}</arg>
+                                    <arg>-PpkgUser=${pkg.user}</arg>
+                                    <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
+                                    <arg>-PpkgCopyInstallScripts=${pkg.copyInstallScripts}</arg>
+                                    <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
+                                    <arg>--warning-mode</arg>
+                                    <arg>all</arg>
+                                </args>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>${pkg.package.phase}</phase>
+                                    <goals>
+                                        <goal>invoke</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-assembly-plugin</artifactId>
+                            <configuration>
+                                <finalName>${pkg.name}</finalName>
+                                <descriptors>
+                                    <descriptor>${main.dir}/packaging/${pkg.type}/assembly/windows.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>assembly</id>
+                                    <phase>${pkg.package.phase}</phase>
+                                    <goals>
+                                        <goal>single</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-install-plugin</artifactId>
+                            <configuration>
+                                <file>${project.build.directory}/${pkg.name}.deb</file>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <groupId>${project.groupId}</groupId>
+                                <version>${project.version}</version>
+                                <classifier>deb</classifier>
+                                <packaging>deb</packaging>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>install-deb</id>
+                                    <phase>${pkg.package.phase}</phase>
+                                    <goals>
+                                        <goal>install-file</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
     <build>
@@ -182,7 +576,7 @@
                 <plugin>
                     <groupId>org.thingsboard</groupId>
                     <artifactId>gradle-maven-plugin</artifactId>
-                    <version>1.0.9</version>
+                    <version>1.0.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -321,6 +715,12 @@
                             <exclude>src/vendor/**</exclude>
                             <exclude>src/font/**</exclude>
                             <exclude>src/sh/**</exclude>
+                            <exclude>packaging/*/scripts/control/**</exclude>
+                            <exclude>packaging/*/scripts/windows/**</exclude>
+                            <exclude>packaging/*/scripts/init/**</exclude>
+                            <exclude>**/*.log</exclude>
+                            <exclude>**/*.current</exclude>
+                            <exclude>.instance_id</exclude>
                             <exclude>src/main/scripts/control/**</exclude>
                             <exclude>src/main/scripts/windows/**</exclude>
                             <exclude>src/main/resources/public/static/rulenode/**</exclude>
@@ -1032,5 +1432,4 @@
             <url>https://oss.sonatype.org/content/groups/public</url>
         </repository>
     </repositories>
-
 </project>
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 76a70b3caf..1b338c34f2 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -155,31 +155,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.thingsboard.server.dao.queue.QueueBenchmark</mainClass>
-                    <classifier>boot</classifier>
-                    <layout>ZIP</layout>
-                    <executable>true</executable>
-                    <excludeDevtools>true</excludeDevtools>
-                    <!--<embeddedLaunchScriptProperties>-->
-                    <!--<confFolder>${pkg.installFolder}/conf</confFolder>-->
-                    <!--<logFolder>${pkg.unixLogFolder}</logFolder>-->
-                    <!--<logFilename>${pkg.name}.out</logFilename>-->
-                    <!--<initInfoProvides>${pkg.name}</initInfoProvides>-->
-                    <!--</embeddedLaunchScriptProperties>-->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 
diff --git a/transport/coap/build.gradle b/transport/coap/build.gradle
deleted file mode 100644
index 1a72b8b68e..0000000000
--- a/transport/coap/build.gradle
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.tools.ant.filters.ReplaceTokens
-
-buildscript {
-    ext {
-        osPackageVersion = "3.8.0"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
-}
-
-apply plugin: "nebula.ospackage"
-
-buildDir = projectBuildDir
-version = projectVersion
-distsDirName = "./"
-
-// OS Package plugin configuration
-ospackage {
-    packageName = pkgName
-    version = "${project.version}"
-    release = 1
-    os = LINUX
-    type = BINARY
-
-    into pkgInstallFolder
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the actual .jar file
-    from(mainJar) {
-        // Strip the version from the jar filename
-        rename { String fileName ->
-            "${pkgName}.jar"
-        }
-        fileMode 0500
-        into "bin"
-    }
-
-    // Copy the config files
-    from("target/conf") {
-        exclude "${pkgName}.conf"
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "conf"
-    }
-
-}
-
-// Configure our RPM build task
-buildRpm {
-
-    arch = NOARCH
-
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
-
-    requires("java-1.8.0")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    preInstall file("${buildDir}/control/rpm/preinst")
-    postInstall file("${buildDir}/control/rpm/postinst")
-    preUninstall file("${buildDir}/control/rpm/prerm")
-    postUninstall file("${buildDir}/control/rpm/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
-        addParentDirs = false
-        fileMode 0644
-        into "/usr/lib/systemd/system"
-    }
-
-    directory(pkgLogFolder, 0755)
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
-
-// Same as the buildRpm task
-buildDeb {
-
-    arch = "all"
-
-    archiveName = "${pkgName}.deb"
-
-    requires("openjdk-8-jre").or("java8-runtime").or("oracle-java8-installer").or("openjdk-8-jre-headless")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.yml")
-    configurationFile("${pkgInstallFolder}/conf/logback.xml")
-
-    preInstall file("${buildDir}/control/deb/preinst")
-    postInstall file("${buildDir}/control/deb/postinst")
-    preUninstall file("${buildDir}/control/deb/prerm")
-    postUninstall file("${buildDir}/control/deb/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    directory(pkgLogFolder, 0755)
-    link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index e83ebc4623..84b92ba548 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -33,10 +33,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
+        <pkg.type>java</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-coap-transport</pkg.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
+        <pkg.copyInstallScripts>false</pkg.copyInstallScripts>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
+        <pkg.implementationTitle>ThingsBoard CoAP Transport Service</pkg.implementationTitle>
+        <pkg.mainClass>org.thingsboard.server.coap.ThingsboardCoapTransportApplication</pkg.mainClass>
     </properties>
 
     <dependencies>
@@ -87,244 +92,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-service-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <excludes>
-                                        <exclude>tb-coap-transport.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-winsw-service</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.sun.winsw</groupId>
-                                    <artifactId>winsw</artifactId>
-                                    <classifier>bin</classifier>
-                                    <type>exe</type>
-                                    <destFileName>service.exe</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/logback.xml</exclude>
-                    </excludes>
-                    <archive>
-                        <manifestEntries>
-                            <Implementation-Title>ThingsBoard CoAP Transport Service</Implementation-Title>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.thingsboard.server.coap.ThingsboardCoapTransportApplication</mainClass>
-                    <classifier>boot</classifier>
-                    <layout>ZIP</layout>
-                    <executable>true</executable>
-                    <excludeDevtools>true</excludeDevtools>
-                    <embeddedLaunchScriptProperties>
-                        <confFolder>${pkg.installFolder}/conf</confFolder>
-                        <logFolder>${pkg.unixLogFolder}</logFolder>
-                        <logFilename>${pkg.name}.out</logFilename>
-                        <initInfoProvides>${pkg.name}</initInfoProvides>
-                    </embeddedLaunchScriptProperties>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <file>${project.build.directory}/${pkg.name}.deb</file>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <groupId>${project.groupId}</groupId>
-                    <version>${project.version}</version>
-                    <classifier>deb</classifier>
-                    <packaging>deb</packaging>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-deb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/transport/coap/src/main/assembly/windows.xml b/transport/coap/src/main/assembly/windows.xml
deleted file mode 100644
index 3cd8ba35c1..0000000000
--- a/transport/coap/src/main/assembly/windows.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
-    Copyright © 2016-2020 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>windows</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!-- Workaround to create logs directory -->
-    <fileSets>
-        <fileSet>
-            <directory>${pkg.win.dist}</directory>
-            <outputDirectory>logs</outputDirectory>
-            <excludes>
-                <exclude>*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${pkg.win.dist}/conf</directory>
-            <outputDirectory>conf</outputDirectory>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</source>
-            <outputDirectory>lib</outputDirectory>
-            <destName>${pkg.name}.jar</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.exe</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.exe</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.xml</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.xml</destName>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/install.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/uninstall.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/transport/coap/src/main/filters/unix.properties b/transport/coap/src/main/filters/unix.properties
deleted file mode 100644
index 8967278673..0000000000
--- a/transport/coap/src/main/filters/unix.properties
+++ /dev/null
@@ -1 +0,0 @@
-pkg.logFolder=${pkg.unixLogFolder}
\ No newline at end of file
diff --git a/transport/coap/src/main/filters/windows.properties b/transport/coap/src/main/filters/windows.properties
deleted file mode 100644
index a6e48d91ba..0000000000
--- a/transport/coap/src/main/filters/windows.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pkg.logFolder=${BASE}\\logs
-pkg.winWrapperLogFolder=%BASE%\\logs
diff --git a/transport/coap/src/main/scripts/control/deb/postinst b/transport/coap/src/main/scripts/control/deb/postinst
deleted file mode 100644
index 0767d3f2c7..0000000000
--- a/transport/coap/src/main/scripts/control/deb/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-update-rc.d ${pkg.name} defaults
-
diff --git a/transport/coap/src/main/scripts/control/deb/postrm b/transport/coap/src/main/scripts/control/deb/postrm
deleted file mode 100644
index 61865803c3..0000000000
--- a/transport/coap/src/main/scripts/control/deb/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-rc.d -f ${pkg.name} remove
diff --git a/transport/coap/src/main/scripts/control/deb/preinst b/transport/coap/src/main/scripts/control/deb/preinst
deleted file mode 100644
index d2ebea46d7..0000000000
--- a/transport/coap/src/main/scripts/control/deb/preinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if ! getent group ${pkg.user} >/dev/null; then
-    addgroup --system ${pkg.user}
-fi
-
-if ! getent passwd ${pkg.user} >/dev/null; then
-    adduser --quiet \
-            --system \
-            --ingroup ${pkg.user} \
-            --quiet \
-            --disabled-login \
-            --disabled-password \
-            --home ${pkg.installFolder} \
-            --no-create-home \
-            -gecos "Thingsboard application" \
-            ${pkg.user}
-fi
diff --git a/transport/coap/src/main/scripts/control/deb/prerm b/transport/coap/src/main/scripts/control/deb/prerm
deleted file mode 100644
index 898d3efd5c..0000000000
--- a/transport/coap/src/main/scripts/control/deb/prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e /var/run/${pkg.name}/${pkg.name}.pid ]; then
-    service ${pkg.name} stop
-fi
diff --git a/transport/coap/src/main/scripts/control/rpm/postrm b/transport/coap/src/main/scripts/control/rpm/postrm
deleted file mode 100644
index 8e1f8a2048..0000000000
--- a/transport/coap/src/main/scripts/control/rpm/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        systemctl try-restart ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/transport/coap/src/main/scripts/control/rpm/preinst b/transport/coap/src/main/scripts/control/rpm/preinst
deleted file mode 100644
index db6306e4ac..0000000000
--- a/transport/coap/src/main/scripts/control/rpm/preinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
--c "Thingsboard application"
diff --git a/transport/coap/src/main/scripts/control/rpm/prerm b/transport/coap/src/main/scripts/control/rpm/prerm
deleted file mode 100644
index accb487b8e..0000000000
--- a/transport/coap/src/main/scripts/control/rpm/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-fi
diff --git a/transport/coap/src/main/scripts/control/tb-coap-transport.service b/transport/coap/src/main/scripts/control/tb-coap-transport.service
deleted file mode 100644
index 3fee5c88df..0000000000
--- a/transport/coap/src/main/scripts/control/tb-coap-transport.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=${pkg.name}
-After=syslog.target
-
-[Service]
-User=${pkg.user}
-ExecStart=${pkg.installFolder}/bin/${pkg.name}.jar
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/transport/coap/src/main/scripts/windows/install.bat b/transport/coap/src/main/scripts/windows/install.bat
deleted file mode 100644
index bce7f62942..0000000000
--- a/transport/coap/src/main/scripts/windows/install.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@ECHO OFF
-
-setlocal ENABLEEXTENSIONS
-
-@ECHO Detecting Java version installed.
-:CHECK_JAVA
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
-@ECHO CurrentVersion %jver%
-
-if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
-
-:JAVA_INSTALLED
-
-@ECHO Java 1.8 found!
-@ECHO Installing ${pkg.name} ...
-
-"%BASE%"${pkg.name}.exe install
-
-@ECHO ${pkg.name} installed successfully!
-
-GOTO END
-
-:JAVA_NOT_INSTALLED
-@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
-@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
-PAUSE
-GOTO END
-
-:END
-
-
diff --git a/transport/coap/src/main/scripts/windows/service.xml b/transport/coap/src/main/scripts/windows/service.xml
deleted file mode 100644
index f7b9d307c8..0000000000
--- a/transport/coap/src/main/scripts/windows/service.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<service>
-    <id>${pkg.name}</id>
-    <name>${project.name}</name>
-    <description>${project.description}</description>
-    <workingdirectory>%BASE%\conf</workingdirectory>
-    <logpath>${pkg.winWrapperLogFolder}</logpath>
-    <logmode>rotate</logmode>
-    <env name="LOADER_PATH" value="%BASE%\conf" />
-    <executable>java</executable>
-    <startargument>-Xloggc:%BASE%\logs\gc.log</startargument>
-    <startargument>-XX:+HeapDumpOnOutOfMemoryError</startargument>
-    <startargument>-XX:+PrintGCDetails</startargument>
-    <startargument>-XX:+PrintGCDateStamps</startargument>
-    <startargument>-XX:+PrintHeapAtGC</startargument>
-    <startargument>-XX:+PrintTenuringDistribution</startargument>
-    <startargument>-XX:+PrintGCApplicationStoppedTime</startargument>
-    <startargument>-XX:+UseGCLogFileRotation</startargument>
-    <startargument>-XX:NumberOfGCLogFiles=10</startargument>
-    <startargument>-XX:GCLogFileSize=10M</startargument>
-    <startargument>-XX:-UseBiasedLocking</startargument>
-    <startargument>-XX:+UseTLAB</startargument>
-    <startargument>-XX:+ResizeTLAB</startargument>
-    <startargument>-XX:+PerfDisableSharedMem</startargument>
-    <startargument>-XX:+UseCondCardMark</startargument>
-    <startargument>-XX:CMSWaitDuration=10000</startargument>
-    <startargument>-XX:+UseParNewGC</startargument>
-    <startargument>-XX:+UseConcMarkSweepGC</startargument>
-    <startargument>-XX:+CMSParallelRemarkEnabled</startargument>
-    <startargument>-XX:+CMSParallelInitialMarkEnabled</startargument>
-    <startargument>-XX:+CMSEdenChunksRecordAlways</startargument>
-    <startargument>-XX:CMSInitiatingOccupancyFraction=75</startargument>
-    <startargument>-XX:+UseCMSInitiatingOccupancyOnly</startargument>
-    <startargument>-jar</startargument>
-    <startargument>%BASE%\lib\${pkg.name}.jar</startargument>
-
-</service>
diff --git a/transport/coap/src/main/scripts/windows/uninstall.bat b/transport/coap/src/main/scripts/windows/uninstall.bat
deleted file mode 100644
index 634b88ddff..0000000000
--- a/transport/coap/src/main/scripts/windows/uninstall.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@ECHO OFF
-
-@ECHO Stopping ${pkg.name} ...
-net stop ${pkg.name}
-
-@ECHO Uninstalling ${pkg.name} ...
-"%~dp0"${pkg.name}.exe uninstall
-
-@ECHO DONE.
\ No newline at end of file
diff --git a/transport/http/build.gradle b/transport/http/build.gradle
deleted file mode 100644
index 1a72b8b68e..0000000000
--- a/transport/http/build.gradle
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.tools.ant.filters.ReplaceTokens
-
-buildscript {
-    ext {
-        osPackageVersion = "3.8.0"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
-}
-
-apply plugin: "nebula.ospackage"
-
-buildDir = projectBuildDir
-version = projectVersion
-distsDirName = "./"
-
-// OS Package plugin configuration
-ospackage {
-    packageName = pkgName
-    version = "${project.version}"
-    release = 1
-    os = LINUX
-    type = BINARY
-
-    into pkgInstallFolder
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the actual .jar file
-    from(mainJar) {
-        // Strip the version from the jar filename
-        rename { String fileName ->
-            "${pkgName}.jar"
-        }
-        fileMode 0500
-        into "bin"
-    }
-
-    // Copy the config files
-    from("target/conf") {
-        exclude "${pkgName}.conf"
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "conf"
-    }
-
-}
-
-// Configure our RPM build task
-buildRpm {
-
-    arch = NOARCH
-
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
-
-    requires("java-1.8.0")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    preInstall file("${buildDir}/control/rpm/preinst")
-    postInstall file("${buildDir}/control/rpm/postinst")
-    preUninstall file("${buildDir}/control/rpm/prerm")
-    postUninstall file("${buildDir}/control/rpm/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
-        addParentDirs = false
-        fileMode 0644
-        into "/usr/lib/systemd/system"
-    }
-
-    directory(pkgLogFolder, 0755)
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
-
-// Same as the buildRpm task
-buildDeb {
-
-    arch = "all"
-
-    archiveName = "${pkgName}.deb"
-
-    requires("openjdk-8-jre").or("java8-runtime").or("oracle-java8-installer").or("openjdk-8-jre-headless")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.yml")
-    configurationFile("${pkgInstallFolder}/conf/logback.xml")
-
-    preInstall file("${buildDir}/control/deb/preinst")
-    postInstall file("${buildDir}/control/deb/postinst")
-    preUninstall file("${buildDir}/control/deb/prerm")
-    postUninstall file("${buildDir}/control/deb/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    directory(pkgLogFolder, 0755)
-    link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index ddbcc5b0bf..a5a377555e 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -33,10 +33,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
+        <pkg.type>java</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-http-transport</pkg.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
+        <pkg.copyInstallScripts>false</pkg.copyInstallScripts>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
+        <pkg.implementationTitle>ThingsBoard HTTP Transport Service</pkg.implementationTitle>
+        <pkg.mainClass>org.thingsboard.server.http.ThingsboardHttpTransportApplication</pkg.mainClass>
     </properties>
 
     <dependencies>
@@ -87,244 +92,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-service-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <excludes>
-                                        <exclude>tb-http-transport.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-winsw-service</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.sun.winsw</groupId>
-                                    <artifactId>winsw</artifactId>
-                                    <classifier>bin</classifier>
-                                    <type>exe</type>
-                                    <destFileName>service.exe</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/logback.xml</exclude>
-                    </excludes>
-                    <archive>
-                        <manifestEntries>
-                            <Implementation-Title>ThingsBoard HTTP Transport Service</Implementation-Title>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.thingsboard.server.http.ThingsboardHttpTransportApplication</mainClass>
-                    <classifier>boot</classifier>
-                    <layout>ZIP</layout>
-                    <executable>true</executable>
-                    <excludeDevtools>true</excludeDevtools>
-                    <embeddedLaunchScriptProperties>
-                        <confFolder>${pkg.installFolder}/conf</confFolder>
-                        <logFolder>${pkg.unixLogFolder}</logFolder>
-                        <logFilename>${pkg.name}.out</logFilename>
-                        <initInfoProvides>${pkg.name}</initInfoProvides>
-                    </embeddedLaunchScriptProperties>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <file>${project.build.directory}/${pkg.name}.deb</file>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <groupId>${project.groupId}</groupId>
-                    <version>${project.version}</version>
-                    <classifier>deb</classifier>
-                    <packaging>deb</packaging>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-deb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/transport/http/src/main/assembly/windows.xml b/transport/http/src/main/assembly/windows.xml
deleted file mode 100644
index 3cd8ba35c1..0000000000
--- a/transport/http/src/main/assembly/windows.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
-    Copyright © 2016-2020 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>windows</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!-- Workaround to create logs directory -->
-    <fileSets>
-        <fileSet>
-            <directory>${pkg.win.dist}</directory>
-            <outputDirectory>logs</outputDirectory>
-            <excludes>
-                <exclude>*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${pkg.win.dist}/conf</directory>
-            <outputDirectory>conf</outputDirectory>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</source>
-            <outputDirectory>lib</outputDirectory>
-            <destName>${pkg.name}.jar</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.exe</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.exe</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.xml</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.xml</destName>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/install.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/uninstall.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/transport/http/src/main/filters/unix.properties b/transport/http/src/main/filters/unix.properties
deleted file mode 100644
index 8967278673..0000000000
--- a/transport/http/src/main/filters/unix.properties
+++ /dev/null
@@ -1 +0,0 @@
-pkg.logFolder=${pkg.unixLogFolder}
\ No newline at end of file
diff --git a/transport/http/src/main/filters/windows.properties b/transport/http/src/main/filters/windows.properties
deleted file mode 100644
index a6e48d91ba..0000000000
--- a/transport/http/src/main/filters/windows.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pkg.logFolder=${BASE}\\logs
-pkg.winWrapperLogFolder=%BASE%\\logs
diff --git a/transport/http/src/main/scripts/control/deb/postrm b/transport/http/src/main/scripts/control/deb/postrm
deleted file mode 100644
index 61865803c3..0000000000
--- a/transport/http/src/main/scripts/control/deb/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-rc.d -f ${pkg.name} remove
diff --git a/transport/http/src/main/scripts/control/deb/preinst b/transport/http/src/main/scripts/control/deb/preinst
deleted file mode 100644
index d2ebea46d7..0000000000
--- a/transport/http/src/main/scripts/control/deb/preinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if ! getent group ${pkg.user} >/dev/null; then
-    addgroup --system ${pkg.user}
-fi
-
-if ! getent passwd ${pkg.user} >/dev/null; then
-    adduser --quiet \
-            --system \
-            --ingroup ${pkg.user} \
-            --quiet \
-            --disabled-login \
-            --disabled-password \
-            --home ${pkg.installFolder} \
-            --no-create-home \
-            -gecos "Thingsboard application" \
-            ${pkg.user}
-fi
diff --git a/transport/http/src/main/scripts/control/deb/prerm b/transport/http/src/main/scripts/control/deb/prerm
deleted file mode 100644
index 898d3efd5c..0000000000
--- a/transport/http/src/main/scripts/control/deb/prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e /var/run/${pkg.name}/${pkg.name}.pid ]; then
-    service ${pkg.name} stop
-fi
diff --git a/transport/http/src/main/scripts/control/rpm/postinst b/transport/http/src/main/scripts/control/rpm/postinst
deleted file mode 100644
index d8021e2dd9..0000000000
--- a/transport/http/src/main/scripts/control/rpm/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-
-if [ $1 -eq 1 ] ; then
-        # Initial installation
-        systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/transport/http/src/main/scripts/control/rpm/postrm b/transport/http/src/main/scripts/control/rpm/postrm
deleted file mode 100644
index 8e1f8a2048..0000000000
--- a/transport/http/src/main/scripts/control/rpm/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        systemctl try-restart ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/transport/http/src/main/scripts/control/rpm/preinst b/transport/http/src/main/scripts/control/rpm/preinst
deleted file mode 100644
index db6306e4ac..0000000000
--- a/transport/http/src/main/scripts/control/rpm/preinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
--c "Thingsboard application"
diff --git a/transport/http/src/main/scripts/control/rpm/prerm b/transport/http/src/main/scripts/control/rpm/prerm
deleted file mode 100644
index accb487b8e..0000000000
--- a/transport/http/src/main/scripts/control/rpm/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-fi
diff --git a/transport/http/src/main/scripts/control/tb-http-transport.service b/transport/http/src/main/scripts/control/tb-http-transport.service
deleted file mode 100644
index 3fee5c88df..0000000000
--- a/transport/http/src/main/scripts/control/tb-http-transport.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=${pkg.name}
-After=syslog.target
-
-[Service]
-User=${pkg.user}
-ExecStart=${pkg.installFolder}/bin/${pkg.name}.jar
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/transport/http/src/main/scripts/windows/install.bat b/transport/http/src/main/scripts/windows/install.bat
deleted file mode 100644
index bce7f62942..0000000000
--- a/transport/http/src/main/scripts/windows/install.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@ECHO OFF
-
-setlocal ENABLEEXTENSIONS
-
-@ECHO Detecting Java version installed.
-:CHECK_JAVA
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
-@ECHO CurrentVersion %jver%
-
-if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
-
-:JAVA_INSTALLED
-
-@ECHO Java 1.8 found!
-@ECHO Installing ${pkg.name} ...
-
-"%BASE%"${pkg.name}.exe install
-
-@ECHO ${pkg.name} installed successfully!
-
-GOTO END
-
-:JAVA_NOT_INSTALLED
-@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
-@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
-PAUSE
-GOTO END
-
-:END
-
-
diff --git a/transport/http/src/main/scripts/windows/service.xml b/transport/http/src/main/scripts/windows/service.xml
deleted file mode 100644
index f7b9d307c8..0000000000
--- a/transport/http/src/main/scripts/windows/service.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<service>
-    <id>${pkg.name}</id>
-    <name>${project.name}</name>
-    <description>${project.description}</description>
-    <workingdirectory>%BASE%\conf</workingdirectory>
-    <logpath>${pkg.winWrapperLogFolder}</logpath>
-    <logmode>rotate</logmode>
-    <env name="LOADER_PATH" value="%BASE%\conf" />
-    <executable>java</executable>
-    <startargument>-Xloggc:%BASE%\logs\gc.log</startargument>
-    <startargument>-XX:+HeapDumpOnOutOfMemoryError</startargument>
-    <startargument>-XX:+PrintGCDetails</startargument>
-    <startargument>-XX:+PrintGCDateStamps</startargument>
-    <startargument>-XX:+PrintHeapAtGC</startargument>
-    <startargument>-XX:+PrintTenuringDistribution</startargument>
-    <startargument>-XX:+PrintGCApplicationStoppedTime</startargument>
-    <startargument>-XX:+UseGCLogFileRotation</startargument>
-    <startargument>-XX:NumberOfGCLogFiles=10</startargument>
-    <startargument>-XX:GCLogFileSize=10M</startargument>
-    <startargument>-XX:-UseBiasedLocking</startargument>
-    <startargument>-XX:+UseTLAB</startargument>
-    <startargument>-XX:+ResizeTLAB</startargument>
-    <startargument>-XX:+PerfDisableSharedMem</startargument>
-    <startargument>-XX:+UseCondCardMark</startargument>
-    <startargument>-XX:CMSWaitDuration=10000</startargument>
-    <startargument>-XX:+UseParNewGC</startargument>
-    <startargument>-XX:+UseConcMarkSweepGC</startargument>
-    <startargument>-XX:+CMSParallelRemarkEnabled</startargument>
-    <startargument>-XX:+CMSParallelInitialMarkEnabled</startargument>
-    <startargument>-XX:+CMSEdenChunksRecordAlways</startargument>
-    <startargument>-XX:CMSInitiatingOccupancyFraction=75</startargument>
-    <startargument>-XX:+UseCMSInitiatingOccupancyOnly</startargument>
-    <startargument>-jar</startargument>
-    <startargument>%BASE%\lib\${pkg.name}.jar</startargument>
-
-</service>
diff --git a/transport/http/src/main/scripts/windows/uninstall.bat b/transport/http/src/main/scripts/windows/uninstall.bat
deleted file mode 100644
index 634b88ddff..0000000000
--- a/transport/http/src/main/scripts/windows/uninstall.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@ECHO OFF
-
-@ECHO Stopping ${pkg.name} ...
-net stop ${pkg.name}
-
-@ECHO Uninstalling ${pkg.name} ...
-"%~dp0"${pkg.name}.exe uninstall
-
-@ECHO DONE.
\ No newline at end of file
diff --git a/transport/mqtt/build.gradle b/transport/mqtt/build.gradle
deleted file mode 100644
index 1a72b8b68e..0000000000
--- a/transport/mqtt/build.gradle
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.tools.ant.filters.ReplaceTokens
-
-buildscript {
-    ext {
-        osPackageVersion = "3.8.0"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
-}
-
-apply plugin: "nebula.ospackage"
-
-buildDir = projectBuildDir
-version = projectVersion
-distsDirName = "./"
-
-// OS Package plugin configuration
-ospackage {
-    packageName = pkgName
-    version = "${project.version}"
-    release = 1
-    os = LINUX
-    type = BINARY
-
-    into pkgInstallFolder
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the actual .jar file
-    from(mainJar) {
-        // Strip the version from the jar filename
-        rename { String fileName ->
-            "${pkgName}.jar"
-        }
-        fileMode 0500
-        into "bin"
-    }
-
-    // Copy the config files
-    from("target/conf") {
-        exclude "${pkgName}.conf"
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "conf"
-    }
-
-}
-
-// Configure our RPM build task
-buildRpm {
-
-    arch = NOARCH
-
-    version = projectVersion.replace('-', '')
-    archiveName = "${pkgName}.rpm"
-
-    requires("java-1.8.0")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    preInstall file("${buildDir}/control/rpm/preinst")
-    postInstall file("${buildDir}/control/rpm/postinst")
-    preUninstall file("${buildDir}/control/rpm/prerm")
-    postUninstall file("${buildDir}/control/rpm/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
-        addParentDirs = false
-        fileMode 0644
-        into "/usr/lib/systemd/system"
-    }
-
-    directory(pkgLogFolder, 0755)
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
-
-// Same as the buildRpm task
-buildDeb {
-
-    arch = "all"
-
-    archiveName = "${pkgName}.deb"
-
-    requires("openjdk-8-jre").or("java8-runtime").or("oracle-java8-installer").or("openjdk-8-jre-headless")
-
-    from("target/conf") {
-        include "${pkgName}.conf"
-        filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
-        fileType CONFIG | NOREPLACE
-        fileMode 0754
-        into "${pkgInstallFolder}/conf"
-    }
-
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
-    configurationFile("${pkgInstallFolder}/conf/${pkgName}.yml")
-    configurationFile("${pkgInstallFolder}/conf/logback.xml")
-
-    preInstall file("${buildDir}/control/deb/preinst")
-    postInstall file("${buildDir}/control/deb/postinst")
-    preUninstall file("${buildDir}/control/deb/prerm")
-    postUninstall file("${buildDir}/control/deb/postrm")
-
-    user pkgName
-    permissionGroup pkgName
-
-    directory(pkgLogFolder, 0755)
-    link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
-    link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
-    link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
-}
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 90b09bf04d..c447f8e8d2 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -33,10 +33,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
+        <pkg.type>java</pkg.type>
+        <pkg.disabled>false</pkg.disabled>
+        <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
+        <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-mqtt-transport</pkg.name>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
-        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
+        <pkg.copyInstallScripts>false</pkg.copyInstallScripts>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
+        <pkg.implementationTitle>ThingsBoard MQTT Transport Service</pkg.implementationTitle>
+        <pkg.mainClass>org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication</pkg.mainClass>
     </properties>
 
     <dependencies>
@@ -87,244 +92,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-service-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-win-conf</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <excludes>
-                                        <exclude>logback.xml</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/conf</directory>
-                                    <excludes>
-                                        <exclude>tb-mqtt-transport.conf</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/control</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/control</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/unix.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-windows-control</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts/windows</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <filters>
-                                <filter>src/main/filters/windows.properties</filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-winsw-service</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.sun.winsw</groupId>
-                                    <artifactId>winsw</artifactId>
-                                    <classifier>bin</classifier>
-                                    <type>exe</type>
-                                    <destFileName>service.exe</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${pkg.win.dist}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/logback.xml</exclude>
-                    </excludes>
-                    <archive>
-                        <manifestEntries>
-                            <Implementation-Title>ThingsBoard MQTT Transport Service</Implementation-Title>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication</mainClass>
-                    <classifier>boot</classifier>
-                    <layout>ZIP</layout>
-                    <executable>true</executable>
-                    <excludeDevtools>true</excludeDevtools>
-                    <embeddedLaunchScriptProperties>
-                        <confFolder>${pkg.installFolder}/conf</confFolder>
-                        <logFolder>${pkg.unixLogFolder}</logFolder>
-                        <logFilename>${pkg.name}.out</logFilename>
-                        <initInfoProvides>${pkg.name}</initInfoProvides>
-                    </embeddedLaunchScriptProperties>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <task>build</task>
-                        <task>buildDeb</task>
-                        <task>buildRpm</task>
-                    </tasks>
-                    <args>
-                        <arg>-PprojectBuildDir=${project.build.directory}</arg>
-                        <arg>-PprojectVersion=${project.version}</arg>
-                        <arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</arg>
-                        <arg>-PpkgName=${pkg.name}</arg>
-                        <arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
-                        <arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
-                    </args>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>invoke</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>${pkg.name}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <file>${project.build.directory}/${pkg.name}.deb</file>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <groupId>${project.groupId}</groupId>
-                    <version>${project.version}</version>
-                    <classifier>deb</classifier>
-                    <packaging>deb</packaging>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-deb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/transport/mqtt/src/main/assembly/windows.xml b/transport/mqtt/src/main/assembly/windows.xml
deleted file mode 100644
index 3cd8ba35c1..0000000000
--- a/transport/mqtt/src/main/assembly/windows.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
-    Copyright © 2016-2020 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>windows</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!-- Workaround to create logs directory -->
-    <fileSets>
-        <fileSet>
-            <directory>${pkg.win.dist}</directory>
-            <outputDirectory>logs</outputDirectory>
-            <excludes>
-                <exclude>*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${pkg.win.dist}/conf</directory>
-            <outputDirectory>conf</outputDirectory>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</source>
-            <outputDirectory>lib</outputDirectory>
-            <destName>${pkg.name}.jar</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.exe</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.exe</destName>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/service.xml</source>
-            <outputDirectory/>
-            <destName>${pkg.name}.xml</destName>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/install.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-        <file>
-            <source>${pkg.win.dist}/uninstall.bat</source>
-            <outputDirectory/>
-            <lineEnding>windows</lineEnding>
-        </file>
-    </files>
-</assembly>
diff --git a/transport/mqtt/src/main/filters/unix.properties b/transport/mqtt/src/main/filters/unix.properties
deleted file mode 100644
index 8967278673..0000000000
--- a/transport/mqtt/src/main/filters/unix.properties
+++ /dev/null
@@ -1 +0,0 @@
-pkg.logFolder=${pkg.unixLogFolder}
\ No newline at end of file
diff --git a/transport/mqtt/src/main/filters/windows.properties b/transport/mqtt/src/main/filters/windows.properties
deleted file mode 100644
index a6e48d91ba..0000000000
--- a/transport/mqtt/src/main/filters/windows.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pkg.logFolder=${BASE}\\logs
-pkg.winWrapperLogFolder=%BASE%\\logs
diff --git a/transport/mqtt/src/main/scripts/control/deb/postinst b/transport/mqtt/src/main/scripts/control/deb/postinst
deleted file mode 100644
index 0767d3f2c7..0000000000
--- a/transport/mqtt/src/main/scripts/control/deb/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-update-rc.d ${pkg.name} defaults
-
diff --git a/transport/mqtt/src/main/scripts/control/deb/postrm b/transport/mqtt/src/main/scripts/control/deb/postrm
deleted file mode 100644
index 61865803c3..0000000000
--- a/transport/mqtt/src/main/scripts/control/deb/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-rc.d -f ${pkg.name} remove
diff --git a/transport/mqtt/src/main/scripts/control/deb/preinst b/transport/mqtt/src/main/scripts/control/deb/preinst
deleted file mode 100644
index d2ebea46d7..0000000000
--- a/transport/mqtt/src/main/scripts/control/deb/preinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if ! getent group ${pkg.user} >/dev/null; then
-    addgroup --system ${pkg.user}
-fi
-
-if ! getent passwd ${pkg.user} >/dev/null; then
-    adduser --quiet \
-            --system \
-            --ingroup ${pkg.user} \
-            --quiet \
-            --disabled-login \
-            --disabled-password \
-            --home ${pkg.installFolder} \
-            --no-create-home \
-            -gecos "Thingsboard application" \
-            ${pkg.user}
-fi
diff --git a/transport/mqtt/src/main/scripts/control/deb/prerm b/transport/mqtt/src/main/scripts/control/deb/prerm
deleted file mode 100644
index 898d3efd5c..0000000000
--- a/transport/mqtt/src/main/scripts/control/deb/prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e /var/run/${pkg.name}/${pkg.name}.pid ]; then
-    service ${pkg.name} stop
-fi
diff --git a/transport/mqtt/src/main/scripts/control/rpm/postinst b/transport/mqtt/src/main/scripts/control/rpm/postinst
deleted file mode 100644
index d8021e2dd9..0000000000
--- a/transport/mqtt/src/main/scripts/control/rpm/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-chown -R ${pkg.user}: ${pkg.logFolder}
-chown -R ${pkg.user}: ${pkg.installFolder}
-
-if [ $1 -eq 1 ] ; then
-        # Initial installation
-        systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/transport/mqtt/src/main/scripts/control/rpm/postrm b/transport/mqtt/src/main/scripts/control/rpm/postrm
deleted file mode 100644
index 8e1f8a2048..0000000000
--- a/transport/mqtt/src/main/scripts/control/rpm/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        systemctl try-restart ${pkg.name}.service >/dev/null 2>&1 || :
-fi
diff --git a/transport/mqtt/src/main/scripts/control/rpm/preinst b/transport/mqtt/src/main/scripts/control/rpm/preinst
deleted file mode 100644
index db6306e4ac..0000000000
--- a/transport/mqtt/src/main/scripts/control/rpm/preinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
--c "Thingsboard application"
diff --git a/transport/mqtt/src/main/scripts/control/rpm/prerm b/transport/mqtt/src/main/scripts/control/rpm/prerm
deleted file mode 100644
index accb487b8e..0000000000
--- a/transport/mqtt/src/main/scripts/control/rpm/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-fi
diff --git a/transport/mqtt/src/main/scripts/control/tb-mqtt-transport.service b/transport/mqtt/src/main/scripts/control/tb-mqtt-transport.service
deleted file mode 100644
index 3fee5c88df..0000000000
--- a/transport/mqtt/src/main/scripts/control/tb-mqtt-transport.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=${pkg.name}
-After=syslog.target
-
-[Service]
-User=${pkg.user}
-ExecStart=${pkg.installFolder}/bin/${pkg.name}.jar
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/transport/mqtt/src/main/scripts/windows/install.bat b/transport/mqtt/src/main/scripts/windows/install.bat
deleted file mode 100644
index bce7f62942..0000000000
--- a/transport/mqtt/src/main/scripts/windows/install.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@ECHO OFF
-
-setlocal ENABLEEXTENSIONS
-
-@ECHO Detecting Java version installed.
-:CHECK_JAVA
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
-@ECHO CurrentVersion %jver%
-
-if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
-
-:JAVA_INSTALLED
-
-@ECHO Java 1.8 found!
-@ECHO Installing ${pkg.name} ...
-
-"%BASE%"${pkg.name}.exe install
-
-@ECHO ${pkg.name} installed successfully!
-
-GOTO END
-
-:JAVA_NOT_INSTALLED
-@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
-@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
-PAUSE
-GOTO END
-
-:END
-
-
diff --git a/transport/mqtt/src/main/scripts/windows/service.xml b/transport/mqtt/src/main/scripts/windows/service.xml
deleted file mode 100644
index f7b9d307c8..0000000000
--- a/transport/mqtt/src/main/scripts/windows/service.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<service>
-    <id>${pkg.name}</id>
-    <name>${project.name}</name>
-    <description>${project.description}</description>
-    <workingdirectory>%BASE%\conf</workingdirectory>
-    <logpath>${pkg.winWrapperLogFolder}</logpath>
-    <logmode>rotate</logmode>
-    <env name="LOADER_PATH" value="%BASE%\conf" />
-    <executable>java</executable>
-    <startargument>-Xloggc:%BASE%\logs\gc.log</startargument>
-    <startargument>-XX:+HeapDumpOnOutOfMemoryError</startargument>
-    <startargument>-XX:+PrintGCDetails</startargument>
-    <startargument>-XX:+PrintGCDateStamps</startargument>
-    <startargument>-XX:+PrintHeapAtGC</startargument>
-    <startargument>-XX:+PrintTenuringDistribution</startargument>
-    <startargument>-XX:+PrintGCApplicationStoppedTime</startargument>
-    <startargument>-XX:+UseGCLogFileRotation</startargument>
-    <startargument>-XX:NumberOfGCLogFiles=10</startargument>
-    <startargument>-XX:GCLogFileSize=10M</startargument>
-    <startargument>-XX:-UseBiasedLocking</startargument>
-    <startargument>-XX:+UseTLAB</startargument>
-    <startargument>-XX:+ResizeTLAB</startargument>
-    <startargument>-XX:+PerfDisableSharedMem</startargument>
-    <startargument>-XX:+UseCondCardMark</startargument>
-    <startargument>-XX:CMSWaitDuration=10000</startargument>
-    <startargument>-XX:+UseParNewGC</startargument>
-    <startargument>-XX:+UseConcMarkSweepGC</startargument>
-    <startargument>-XX:+CMSParallelRemarkEnabled</startargument>
-    <startargument>-XX:+CMSParallelInitialMarkEnabled</startargument>
-    <startargument>-XX:+CMSEdenChunksRecordAlways</startargument>
-    <startargument>-XX:CMSInitiatingOccupancyFraction=75</startargument>
-    <startargument>-XX:+UseCMSInitiatingOccupancyOnly</startargument>
-    <startargument>-jar</startargument>
-    <startargument>%BASE%\lib\${pkg.name}.jar</startargument>
-
-</service>
diff --git a/transport/mqtt/src/main/scripts/windows/uninstall.bat b/transport/mqtt/src/main/scripts/windows/uninstall.bat
deleted file mode 100644
index 634b88ddff..0000000000
--- a/transport/mqtt/src/main/scripts/windows/uninstall.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@ECHO OFF
-
-@ECHO Stopping ${pkg.name} ...
-net stop ${pkg.name}
-
-@ECHO Uninstalling ${pkg.name} ...
-"%~dp0"${pkg.name}.exe uninstall
-
-@ECHO DONE.
\ No newline at end of file