diff --git a/.gitignore b/.gitignore
index b33d82f40..bdef801a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,21 +12,11 @@ win-linux/package/windows/index.html
 win-linux/package/linux/common/opt
 win-linux/package/linux/common/usr/share/applications/variables.m4
 win-linux/package/linux/common/usr/share/flyfm/templates/desktopeditors.*.desktop
-win-linux/package/linux/deb/debian/.debhelper
-win-linux/package/linux/deb/debian/*.debhelper.log
-win-linux/package/linux/deb/debian/changelog
-win-linux/package/linux/deb/debian/control
-win-linux/package/linux/deb/debian/files
-win-linux/package/linux/deb/debian/*.dirs
-win-linux/package/linux/deb/debian/*.install
-win-linux/package/linux/deb/debian/*.links
-win-linux/package/linux/deb/debian/*.substvars
-win-linux/package/linux/deb/debian/postinst
-win-linux/package/linux/deb/debian/postrm
-win-linux/package/linux/deb/debian/prerm
-win-linux/package/linux/deb/debian/rules
-win-linux/package/linux/deb/i386
-win-linux/package/linux/deb/amd64
+/win-linux/package/linux/deb*/build
+/win-linux/package/linux/deb*/*.buildinfo
+/win-linux/package/linux/deb*/*.changes
+/win-linux/package/linux/deb*/*.ddeb
+/win-linux/package/linux/deb*/*.deb
 win-linux/package/linux/rpm/builddir
 win-linux/package/linux/apt-rpm/builddir
 win-linux/package/linux/urpmi/builddir
diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile
index 64a19d1ac..2df927cc9 100644
--- a/win-linux/package/linux/Makefile
+++ b/win-linux/package/linux/Makefile
@@ -44,15 +44,11 @@ ifneq ($(filter %86,$(UNAME_M)),)
 endif
 
 RPM_BUILD_DIR = $(PWD)/rpm/builddir
-DEB_BUILD_DIR = $(PWD)/deb
-DEB_ASTRA_BUILD_DIR = $(PWD)/deb-astra
 APT_RPM_BUILD_DIR = $(PWD)/apt-rpm/builddir
 URPMI_BUILD_DIR = $(PWD)/urpmi/builddir
 TAR_BUILD_DIR = $(PWD)/tar
 
 RPM_PACKAGE_DIR = $(RPM_BUILD_DIR)/RPMS/$(RPM_ARCH)
-DEB_PACKAGE_DIR = $(DEB_BUILD_DIR)
-DEB_ASTRA_PACKAGE_DIR = $(DEB_ASTRA_BUILD_DIR)
 APT_RPM_PACKAGE_DIR = $(APT_RPM_BUILD_DIR)/RPMS/$(APT_RPM_ARCH)
 URPMI_PACKAGE_DIR = $(URPMI_BUILD_DIR)/RPMS/$(URPMI_ARCH)
 TAR_PACKAGE_DIR = $(TAR_BUILD_DIR)/$(TAR_ARCH)
@@ -60,8 +56,8 @@ TAR_PACKAGE_DIR = $(TAR_BUILD_DIR)/$(TAR_ARCH)
 RPM = $(RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(RPM_ARCH).rpm
 APT_RPM = $(APT_RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(APT_RPM_ARCH).rpm
 URPMI = $(URPMI_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(URPMI_ARCH).rpm
-DEB = $(DEB_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH).deb
-DEB_ASTRA = $(DEB_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)-astra_$(DEB_ARCH).deb
+DEB = deb/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH).deb
+DEB_ASTRA = deb-astra/$(PACKAGE_NAME)_$(PACKAGE_VERSION)-astra_$(DEB_ARCH).deb
 TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(TAR_ARCH).tar.gz
 
 ifeq ($(COMPANY_NAME), ONLYOFFICE)
@@ -94,28 +90,32 @@ LINUX_DEPS += $(BIN_FILES)
 LINUX_DEPS += $(DESKTOP_FILES)
 LINUX_DEPS += $(SYMLINK)
 
-DEB_DEPS += deb/debian/changelog
-DEB_DEPS += deb/debian/control
-DEB_DEPS += deb/debian/postinst
-DEB_DEPS += deb/debian/postrm
-DEB_DEPS += deb/debian/prerm
-DEB_DEPS += deb/debian/rules
-DEB_DEPS += deb/debian/$(PACKAGE_NAME).dirs
-DEB_DEPS += deb/debian/$(PACKAGE_NAME).install
-DEB_DEPS += deb/debian/$(PACKAGE_NAME).links
+DEB_DEPS += deb/build/debian/changelog
+DEB_DEPS += deb/build/debian/compat
+DEB_DEPS += deb/build/debian/control
+DEB_DEPS += deb/build/debian/postinst
+DEB_DEPS += deb/build/debian/postrm
+DEB_DEPS += deb/build/debian/prerm
+DEB_DEPS += deb/build/debian/rules
+DEB_DEPS += deb/build/debian/source/format
+DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).dirs
+DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).install
+DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).links
 
+DEB_ASTRA_DEPS += deb-astra/build/debian/changelog
+DEB_ASTRA_DEPS += deb-astra/build/debian/compat
+DEB_ASTRA_DEPS += deb-astra/build/debian/control
+DEB_ASTRA_DEPS += deb-astra/build/debian/postinst
+DEB_ASTRA_DEPS += deb-astra/build/debian/postrm
+DEB_ASTRA_DEPS += deb-astra/build/debian/prerm
+DEB_ASTRA_DEPS += deb-astra/build/debian/rules
+DEB_ASTRA_DEPS += deb-astra/build/debian/source/format
+DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).dirs
+DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).install
+DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).links
 DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.docx.desktop
 DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.xlsx.desktop
 DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.pptx.desktop
-DEB_ASTRA_DEPS += deb-astra/debian/changelog
-DEB_ASTRA_DEPS += deb-astra/debian/control
-DEB_ASTRA_DEPS += deb-astra/debian/postinst
-DEB_ASTRA_DEPS += deb-astra/debian/postrm
-DEB_ASTRA_DEPS += deb-astra/debian/prerm
-DEB_ASTRA_DEPS += deb-astra/debian/rules
-DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).dirs
-DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).install
-DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).links
 
 INSTALLER_DEPENDENCY += desktopeditor
 
@@ -153,6 +153,9 @@ M4_PARAMS += -D M4_DEB_ARCH='$(DEB_ARCH)'
 ifdef ASTRALINUX_KEYS_DIR
 	M4_PARAMS += -D M4_ASTRALINUX_KEYS_DIR='$(abspath $(ASTRALINUX_KEYS_DIR))'
 endif
+ifdef ASTRALINUX_SIGN_IMAGE
+	M4_PARAMS += -D M4_ASTRALINUX_SIGN_IMAGE='$(ASTRALINUX_SIGN_IMAGE)'
+endif
 
 RPM_PARAMS += --define '_company_name $(COMPANY_NAME)'
 RPM_PARAMS += --define '_product_name $(PRODUCT_NAME)'
@@ -203,15 +206,12 @@ clean:
 		common/etc \
 		common/opt \
 		$(LINUX_DEPS) \
-		$(DEB_DEPS) \
-		$(DEB_BUILD_DIR)/debian/.debhelper \
-		$(DEB_BUILD_DIR)/debian/files \
-		$(DEB_BUILD_DIR)/debian/$(PACKAGE_NAME)* \
-		$(DEB_PACKAGE_DIR)/*.deb \
-		$(DEB_PACKAGE_DIR)/*.ddeb \
-		$(DEB_PACKAGE_DIR)/../*.buildinfo \
-		$(DEB_PACKAGE_DIR)/../*.changes \
-		$(DEB_ASTRA_BUILD_DIR) \
+		deb/build \
+		deb/*.buildinfo \
+		deb/*.changes \
+		deb/*.ddeb \
+		deb/*.deb \
+		deb-astra \
 		$(RPM_BUILD_DIR) \
 		$(APT_RPM_BUILD_DIR) \
 		$(URPMI_BUILD_DIR) \
@@ -263,11 +263,31 @@ $(RPM): desktopeditor rpm/$(PACKAGE_NAME).spec
 		$(RPM_PARAMS) \
 		package.spec
 
+deb/build/debian/% : deb/template/%
+	mkdir -pv $(@D) && cp -fv $< $@
+
+deb/build/debian/% : deb/template/%.m4
+	mkdir -pv $(@D) && m4 $(M4_PARAMS) $< > $@
+
+deb/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4
+	mkdir -pv $(@D) && m4 $(M4_PARAMS) $< > $@
+
+deb-astra/build/debian/% : deb/template/%
+	mkdir -pv $(@D) && cp -fv $< $@
+
+deb-astra/build/debian/% : deb/template/%.m4
+	mkdir -pv $(@D) && \
+	m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@
+
+deb-astra/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4
+	mkdir -pv $(@D) && \
+	m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@
+
 $(DEB): desktopeditor $(DEB_DEPS)
-	cd deb && dpkg-buildpackage -b -uc -us --changes-option=-u.
+	cd deb/build && dpkg-buildpackage -b -uc -us
 
 $(DEB_ASTRA): desktopeditor $(DEB_ASTRA_DEPS)
-	cd deb-astra && dpkg-buildpackage -b -uc -us --changes-option=-u.
+	cd deb-astra/build && dpkg-buildpackage -b -uc -us
 
 $(APT_RPM): desktopeditor apt-rpm/$(PACKAGE_NAME).spec
 	cd apt-rpm && setarch $(APT_RPM_ARCH) rpmbuild -bb \
@@ -305,26 +325,10 @@ common/usr/share/applications/$(IMAGEVIEWER_EXEC).desktop : common/usr/share/app
 common/usr/share/applications/$(VIDEOPLAYER_EXEC).desktop : common/usr/share/applications/videoplayer.desktop.m4 common/usr/share/applications/variables.m4
 common/usr/bin/desktopeditors : common/usr/bin/$(DESKTOPEDITORS_EXEC)
 common/usr/bin/$(COMPANY_NAME_LOW) : common/usr/bin/$(DESKTOPEDITORS_EXEC)
-deb/debian/$(PACKAGE_NAME).dirs : deb/debian/package.dirs.m4
-deb/debian/$(PACKAGE_NAME).install : deb/debian/package.install.m4
-deb/debian/$(PACKAGE_NAME).links : deb/debian/package.links.m4
 
-$(BIN_FILES) $(DESKTOP_FILES) deb/debian/$(PACKAGE_NAME).dirs deb/debian/$(PACKAGE_NAME).install deb/debian/$(PACKAGE_NAME).links :
+$(BIN_FILES) $(DESKTOP_FILES) :
 	m4 -I'common/usr/share/applications' $(M4_PARAMS) $< > $@
 
-deb-astra/debian/changelog : deb/debian/changelog.m4 branding
-deb-astra/debian/control : deb/debian/control.m4 branding
-deb-astra/debian/$(PACKAGE_NAME).dirs : deb/debian/package.dirs.m4 branding
-deb-astra/debian/$(PACKAGE_NAME).install : deb/debian/package.install.m4 branding
-deb-astra/debian/$(PACKAGE_NAME).links : deb/debian/package.links.m4 branding
-deb-astra/debian/postinst : deb/debian/postinst.m4 branding
-deb-astra/debian/postrm : deb/debian/postrm.m4 branding
-deb-astra/debian/prerm : deb/debian/prerm.m4 branding
-deb-astra/debian/rules.m4 : branding
-
-deb-astra/debian/changelog deb-astra/debian/control deb-astra/debian/$(PACKAGE_NAME).dirs deb-astra/debian/$(PACKAGE_NAME).install deb-astra/debian/$(PACKAGE_NAME).links deb-astra/debian/postinst deb-astra/debian/postrm deb-astra/debian/prerm :
-	m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@
-
 $(SYMLINK) :
 	ln -srf $< $@
 
diff --git a/win-linux/package/linux/deb/debian/compat b/win-linux/package/linux/deb/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/win-linux/package/linux/deb/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/win-linux/package/linux/deb/debian/package.install.m4 b/win-linux/package/linux/deb/debian/package.install.m4
deleted file mode 100644
index 944982807..000000000
--- a/win-linux/package/linux/deb/debian/package.install.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-../common/opt/desktopeditors/* /opt/M4_DESKTOPEDITORS_PREFIX/
-../common/usr/bin/M4_DESKTOPEDITORS_EXEC /usr/bin/
-../common/usr/share/applications/M4_DESKTOPEDITORS_EXEC.desktop /usr/share/applications/
-
-ifelse(M4_COMPANY_NAME, ONLYOFFICE,
-../common/usr/bin/desktopeditors /usr/bin/,
-../common/opt/mediaviewer/* /opt/M4_MEDIAVIEWER_PREFIX/
-../common/usr/bin/M4_IMAGEVIEWER_EXEC /usr/bin/
-../common/usr/bin/M4_VIDEOPLAYER_EXEC /usr/bin/
-../common/usr/share/applications/M4_IMAGEVIEWER_EXEC.desktop /usr/share/applications/
-../common/usr/share/applications/M4_VIDEOPLAYER_EXEC.desktop /usr/share/applications/
-../common/usr/share/flyfm/templates/desktopeditors.*.desktop /usr/share/flyfm/templates/
-../common/usr/bin/M4_PACKAGE_NAME /usr/bin/)
diff --git a/win-linux/package/linux/deb/debian/changelog.m4 b/win-linux/package/linux/deb/template/changelog.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/changelog.m4
rename to win-linux/package/linux/deb/template/changelog.m4
diff --git a/win-linux/package/linux/deb/template/compat b/win-linux/package/linux/deb/template/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/win-linux/package/linux/deb/template/compat
@@ -0,0 +1 @@
+10
diff --git a/win-linux/package/linux/deb/debian/control.m4 b/win-linux/package/linux/deb/template/control.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/control.m4
rename to win-linux/package/linux/deb/template/control.m4
diff --git a/win-linux/package/linux/deb/debian/package.dirs.m4 b/win-linux/package/linux/deb/template/package.dirs.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/package.dirs.m4
rename to win-linux/package/linux/deb/template/package.dirs.m4
diff --git a/win-linux/package/linux/deb/template/package.install.m4 b/win-linux/package/linux/deb/template/package.install.m4
new file mode 100644
index 000000000..3e24b9ab7
--- /dev/null
+++ b/win-linux/package/linux/deb/template/package.install.m4
@@ -0,0 +1,13 @@
+../../common/opt/desktopeditors/* /opt/M4_DESKTOPEDITORS_PREFIX
+../../common/usr/bin/M4_DESKTOPEDITORS_EXEC /usr/bin
+../../common/usr/share/applications/M4_DESKTOPEDITORS_EXEC.desktop /usr/share/applications
+
+ifelse(M4_COMPANY_NAME, ONLYOFFICE,
+../../common/usr/bin/desktopeditors /usr/bin,
+../../common/opt/mediaviewer/* /opt/M4_MEDIAVIEWER_PREFIX
+../../common/usr/bin/M4_IMAGEVIEWER_EXEC /usr/bin
+../../common/usr/bin/M4_VIDEOPLAYER_EXEC /usr/bin
+../../common/usr/share/applications/M4_IMAGEVIEWER_EXEC.desktop /usr/share/applications
+../../common/usr/share/applications/M4_VIDEOPLAYER_EXEC.desktop /usr/share/applications
+../../common/usr/share/flyfm/templates/desktopeditors.*.desktop /usr/share/flyfm/templates
+../../common/usr/bin/M4_PACKAGE_NAME /usr/bin)
diff --git a/win-linux/package/linux/deb/debian/package.links.m4 b/win-linux/package/linux/deb/template/package.links.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/package.links.m4
rename to win-linux/package/linux/deb/template/package.links.m4
diff --git a/win-linux/package/linux/deb/debian/postinst.m4 b/win-linux/package/linux/deb/template/postinst.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/postinst.m4
rename to win-linux/package/linux/deb/template/postinst.m4
diff --git a/win-linux/package/linux/deb/debian/postrm.m4 b/win-linux/package/linux/deb/template/postrm.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/postrm.m4
rename to win-linux/package/linux/deb/template/postrm.m4
diff --git a/win-linux/package/linux/deb/debian/prerm.m4 b/win-linux/package/linux/deb/template/prerm.m4
similarity index 100%
rename from win-linux/package/linux/deb/debian/prerm.m4
rename to win-linux/package/linux/deb/template/prerm.m4
diff --git a/win-linux/package/linux/deb/debian/rules.m4 b/win-linux/package/linux/deb/template/rules.m4
similarity index 62%
rename from win-linux/package/linux/deb/debian/rules.m4
rename to win-linux/package/linux/deb/template/rules.m4
index 28b84cfe7..84a92d548 100755
--- a/win-linux/package/linux/deb/debian/rules.m4
+++ b/win-linux/package/linux/deb/template/rules.m4
@@ -1,18 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
 	dh $@
 
-override_dh_installdocs:
-	dh_installdocs --no-act
-
-override_dh_installchangelogs:
-	dh_installchangelogs --no-act
-
 override_dh_fixperms:
 	dh_fixperms
 	chmod 755 debian/M4_PACKAGE_NAME/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors
@@ -21,8 +14,13 @@ override_dh_fixperms:
 	chmod 755 debian/M4_PACKAGE_NAME/opt/M4_MEDIAVIEWER_PREFIX/VideoPlayer
 	chmod 777 debian/M4_PACKAGE_NAME/etc/M4_PACKAGE_NAME)
 
-override_dh_shlibdeps:
-	dh_shlibdeps --no-act
+ifdef(`M4_ASTRALINUX_SIGN_IMAGE',
+override_dh_strip:
+	dh_strip
+	docker run --rm \
+		-v M4_ASTRALINUX_KEYS_DIR:/root/keys \
+		-v $(shell pwd)/debian/M4_PACKAGE_NAME:/root/buildroot \
+		--name sign-app \
+		M4_ASTRALINUX_SIGN_IMAGE,)
 
-override_dh_builddeb:
-	dh_builddeb --destdir=.
+override_dh_shlibdeps:
diff --git a/win-linux/package/linux/deb/debian/source/format b/win-linux/package/linux/deb/template/source/format
similarity index 100%
rename from win-linux/package/linux/deb/debian/source/format
rename to win-linux/package/linux/deb/template/source/format