diff --git a/launchpad/artful/changelog b/launchpad/artful/changelog
index cb27ce7f0..9af42352c 100644
--- a/launchpad/artful/changelog
+++ b/launchpad/artful/changelog
@@ -1,3 +1,9 @@
+opentx-companion22 (2.2.1~ppa01~artful) artful; urgency=low
+
+  * New release 2.2.1~ppa01
+
+ -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:37 +0100
+
 opentx-companion22 (2.2.1~N432+test01~artful) artful; urgency=low
 
   * New release 2.2.1~N432+test01
diff --git a/launchpad/bionic/changelog b/launchpad/bionic/changelog
new file mode 100644
index 000000000..8aa37fdef
--- /dev/null
+++ b/launchpad/bionic/changelog
@@ -0,0 +1,6 @@
+opentx-companion22 (2.2.1~ppa01~bionic) bionic; urgency=low
+
+  * New release 2.2.1~ppa01
+
+ -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:37 +0100
+
diff --git a/launchpad/common/rules b/launchpad/common/rules
index 10fb66b5f..1c0ffb480 100755
--- a/launchpad/common/rules
+++ b/launchpad/common/rules
@@ -6,7 +6,7 @@ COMMON_OPTIONS = -DCMAKE_INSTALL_PREFIX=../debian/tmp/usr \
                  -DFIRMWARE_TARGET=NO \
                  -DGVARS=YES \
                  -DHELI=YES \
-                 -DALLOW_NIGHTLY_BUILDS=YES \
+                 -DALLOW_NIGHTLY_BUILDS=NO \
                  -DVERSION_SUFFIX=__VERSION_SUFFIX__
 
 STM32_OPTIONS = -DLUA=YES
diff --git a/launchpad/trusty/changelog b/launchpad/trusty/changelog
deleted file mode 100644
index ad4e05fc0..000000000
--- a/launchpad/trusty/changelog
+++ /dev/null
@@ -1,17 +0,0 @@
-opentx-companion22 (2.2.1~N432+test01~trusty) trusty; urgency=low
-
-  * New release 2.2.1~N432+test01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Fri, 10 Nov 2017 18:29:43 +0100
-
-opentx-companion22 (2.2.0~ppa02~trusty) trusty; urgency=low
-
-  * New release 2.2.0~ppa02
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Wed, 31 May 2017 22:37:49 +0200
-
-opentx-companion22 (2.2.0~ppa01~trusty) trusty; urgency=low
-
-  * OpenTX version 2.2.0
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Wed, 31 May 2017 21:50:39 +0200
diff --git a/launchpad/xenial/changelog b/launchpad/xenial/changelog
index 64caae4aa..6e5e7c612 100644
--- a/launchpad/xenial/changelog
+++ b/launchpad/xenial/changelog
@@ -1,3 +1,9 @@
+opentx-companion22 (2.2.1~ppa01~xenial) xenial; urgency=low
+
+  * New release 2.2.1~ppa01
+
+ -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:44 +0100
+
 opentx-companion22 (2.2.1~N432+test01~xenial) xenial; urgency=low
 
   * New release 2.2.1~N432+test01
diff --git a/launchpad/zesty/changelog b/launchpad/zesty/changelog
index 3c4e89a4d..feec662d5 100644
--- a/launchpad/zesty/changelog
+++ b/launchpad/zesty/changelog
@@ -1,3 +1,9 @@
+opentx-companion22 (2.2.1~ppa01~zesty) zesty; urgency=low
+
+  * New release 2.2.1~ppa01
+
+ -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:48 +0100
+
 opentx-companion22 (2.2.1~N432+test01~zesty) zesty; urgency=low
 
   * New release 2.2.1~N432+test01