diff --git a/debian/control b/debian/control
index bae9cea..0f804a6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Package: proxmox-mailgateway
 Architecture: all
 Depends: libc6,
+	 proxmox-archive-keyring,
 	 pve-kernel-5.4,
 	 pve-kernel-helper,
 	 pmg-api
@@ -26,7 +27,7 @@ Description: Default Proxmox Kernel Headers
 
 Package: proxmox-mailgateway-container
 Architecture: all
-Depends: libc6, pmg-api
+Depends: libc6, pmg-api, proxmox-archive-keyring
 Replaces: proxmox-mailgateway
 Breaks: proxmox-mailgateway
 Provides: proxmox-mailgateway
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 2a97eee..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-proxmox-mailgateway: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-*
diff --git a/debian/postinst b/debian/postinst
index 2c339ab..a8ed163 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,4 +12,6 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#
+
 exit 0
diff --git a/debian/postrm b/debian/postrm
index 2ee5c14..6306c44 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -17,3 +17,6 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#
+
+exit 0
diff --git a/debian/proxmox-mailgateway-container.install b/debian/proxmox-mailgateway-container.install
deleted file mode 100644
index aff0ac4..0000000
--- a/debian/proxmox-mailgateway-container.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/proxmox-ve-release-5.x.gpg etc/apt/trusted.gpg.d/
-debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/
diff --git a/debian/proxmox-mailgateway-container.lintian-overrides b/debian/proxmox-mailgateway-container.lintian-overrides
deleted file mode 100644
index d324f05..0000000
--- a/debian/proxmox-mailgateway-container.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-proxmox-mailgateway-container: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-*
diff --git a/debian/proxmox-mailgateway-container.maintscript b/debian/proxmox-mailgateway-container.maintscript
new file mode 120000
index 0000000..09191e6
--- /dev/null
+++ b/debian/proxmox-mailgateway-container.maintscript
@@ -0,0 +1 @@
+proxmox-mailgateway.maintscript
\ No newline at end of file
diff --git a/debian/proxmox-mailgateway.install b/debian/proxmox-mailgateway.install
index f849d05..4183813 100644
--- a/debian/proxmox-mailgateway.install
+++ b/debian/proxmox-mailgateway.install
@@ -1,3 +1 @@
-debian/proxmox-ve-release-5.x.gpg etc/apt/trusted.gpg.d/
-debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/
 debian/grub/proxmox-mailgateway.cfg etc/default/grub.d/
diff --git a/debian/proxmox-mailgateway.maintscript b/debian/proxmox-mailgateway.maintscript
new file mode 100644
index 0000000..5a234c1
--- /dev/null
+++ b/debian/proxmox-mailgateway.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-5.x.gpg 6.2-2~~
+rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg 6.2-2~~
diff --git a/debian/proxmox-ve-release-5.x.gpg b/debian/proxmox-ve-release-5.x.gpg
deleted file mode 100644
index 8488f45..0000000
Binary files a/debian/proxmox-ve-release-5.x.gpg and /dev/null differ
diff --git a/debian/proxmox-ve-release-6.x.gpg b/debian/proxmox-ve-release-6.x.gpg
deleted file mode 100644
index efebf1c..0000000
Binary files a/debian/proxmox-ve-release-6.x.gpg and /dev/null differ