diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh
index 002e9cb44ecbc940ca4dd3164fed66138236b3a4..9ce414ddb4a53d87553b2176e64747c93833425f 100644
--- a/pkg/appimage/appimage.sh
+++ b/pkg/appimage/appimage.sh
@@ -1,18 +1,19 @@
 #!/bin/sh
 
 PKGNAME='ocs-manager'
+PKGVER='0.0.0'
+PKGREL='1'
+
+curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+chmod 755 linuxdeployqt
+./linuxdeployqt --appimage-extract
 
 sh scripts/import.sh
 qmake PREFIX="/usr"
 make
 make INSTALL_ROOT="${PKGNAME}.AppDir" install
 
-curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
-
 ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
 ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
 
-mv *.AppImage rename.AppImage
-mv rename.AppImage ${PKGNAME}-x86_64.AppImage
+mv *.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index 12573088cc001e0e9d72cf56cfabb26901a32def..d90fd9aab7d004eefec7c3c5f9d8bcc8ffdfdbf2 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-################################################################################
-# This is wrapper script for build.sh use from inside docker container
-################################################################################
-
 PKGNAME='ocs-manager'
 
 PKGUSER='pkgbuilder'
diff --git a/scripts/build.sh b/scripts/build.sh
index eabd464009bdc9c03bc25fda651ffead8638a0c8..a403d8a5bf31d71b451616bd45fb2f7cd9556d6d 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-################################################################################
-# This is utility script to build distribution packages
-################################################################################
-
 PKGNAME='ocs-manager'
 
 BUILDTYPE=''
diff --git a/scripts/import.sh b/scripts/import.sh
index daddb4d66d7ecf78f88ce04e881555babed97dcf..64f9385d803786dcee097c4e88ccbc97a7cd50d2 100644
--- a/scripts/import.sh
+++ b/scripts/import.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-################################################################################
-# This is utility script to import build dependencies
-################################################################################
-
 PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
 
 if [ ! -d "${PROJDIR}/lib/qtlib" ]; then