diff --git a/core/debian/univention-bareos.install.in b/core/debian/univention-bareos.install
similarity index 97%
rename from core/debian/univention-bareos.install.in
rename to core/debian/univention-bareos.install
index d31eb6f9a20..8dc2ea9dc43 100644
--- a/core/debian/univention-bareos.install.in
+++ b/core/debian/univention-bareos.install
@@ -1,4 +1,4 @@
-/etc/bareos/bareos-com-release.key
+/etc/bareos/bareos-release.key
 /etc/bareos/autogenerated/clients/generic.template
 /etc/bareos/autogenerated/clients/windows.template
 /etc/cron.d/univention-bareos
diff --git a/core/platforms/univention/AppCenter/LICENSE_AGREEMENT.in b/core/platforms/univention/AppCenter/LICENSE_AGREEMENT
similarity index 100%
rename from core/platforms/univention/AppCenter/LICENSE_AGREEMENT.in
rename to core/platforms/univention/AppCenter/LICENSE_AGREEMENT
diff --git a/core/platforms/univention/CMakeLists.txt b/core/platforms/univention/CMakeLists.txt
index c9080593402..a00aa3c640a 100644
--- a/core/platforms/univention/CMakeLists.txt
+++ b/core/platforms/univention/CMakeLists.txt
@@ -57,7 +57,11 @@ install(
 )
 
 install(
-  FILES "bareos-com-release.key"
+  # This file contains the Bareos repository signature public.
+  # During the automatic build process, It will be added.
+  # For manual builds, download the file from 
+  # http://download.bareos.org/bareos/release/<RELEASE>/<DISTRIBUTION>/Release.key
+  FILES "bareos-release.key"
   DESTINATION "${confdir}"
 )
 
diff --git a/core/platforms/univention/bareos-com-release.key b/core/platforms/univention/bareos-com-release.key
deleted file mode 100644
index 40e97fa1f90..00000000000
--- a/core/platforms/univention/bareos-com-release.key
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-mQINBFXbK+sBEADHrDhXMa3bvy4f5MBwifTQswcXqiAkKQ5GRsHxMZIsJkq86Ewr
-vt2jOn+sXPiWLn/hSXNohUmWu63OKiCJFZ9TLAWzFM0T3vYeevB3XviEzLlMcQZx
-/dlCKpwa7B2dSISPsN1pe0Nnm0TKRUzIhEzYvwLs1mhBk0nJTrLMiuK+eJBnaI7R
-9nnf3EBM0Am7ejJIZCbNKWik8wtF/h6MfeZ8bk3K4bHwGTl8lr27SOCFXcXJQgbR
-bgSNHf/krRyItcIFf9eXP7YW2IOZqit+SdAnqlx6qFP1Y1JZHLADvCKesGEv9xDz
-4mMWpcUmKt/lJD03CzG4hqLUe8IPEHrVsFgpz/wBML2qdD1iFWhhbjinEox/fCvG
-BTqupd9Th9unRDuM+bOvV2AnldysCO88fbdVoXKFmyA28Uq349eEy4us8qVMbGHc
-29BViHk7eHRewfQftKOdlmwgiqaxcyvaIbitsS3cpVuz+iHYlqR5X5U7yLeDJnI7
-9YYfEAzpl9bAZP55RBcCgQ4Fdn+hFW60kzVa0dlsfI3Zujjxq/uXVTLgQkbXmhtD
-BbkCIryyfOQwkLsbkq0A2U+7SPly44eWL1Nq6ElhXMjZ1PPuCaEmTjx7dOxkuxNM
-XQONSjT8TgMnSv0CCdTFKAifaEkaYPdqKWQNb6CONZuGIwd9UsZlVXOjywARAQAB
-tDFCYXJlb3MgUGFja2FnaW5nIFNpZ25pbmcgS2V5IDxzaWduaW5nQGJhcmVvcy5j
-b20+iQI+BBMBAgAoBQJV2yvrAhsDBQkKTLgABgsJCAcDAgYVCAIJCgsEFgIDAQIe
-AQIXgAAKCRD5PAKMCTv7omBGD/0dle6NpYwaCO66LcPv7Cg7QA86XgrlwoFI0gQt
-Ffqn5tE/dpa0BT1vVWUL84yhPI2RAvC4uWTOBvmquCMChtZ1cY3UNayFKRE+gGmj
-5h5cwdLRUebpbKAXDYN1QT/HdTd+iZSeKCCP2JJeXZjP/5hPDcn3MHQ1iyJMD4OE
-KcWTG9WSHZyetPhms+OwJntxg8U3OkiAjAOzwKuzrTQwPzfjLKDWRp3/f0gRymrn
-JJLuJhK/cI1gNUK2fbdYG9Cmp2LaMv6ADXw/pAUsZPicbcftDawHwaAh90GIwpu6
-uo1kL8+nXBpac9pZqf/LX133GnXTpeGpAJC7Wdc8CeVwamvhXHM3+2wI6l+scICc
-xmxnDugU8W1nt6uQYiTzwARwX3OhlM0y1yYpSPPXRLbB6Rtlt4N5HqCkHHuWIVrB
-Bo/iRQYh0wNCKjPGHucqsuO0WvRydQQAk0nrcdb/Mt+MQ7dic106i9+3Y78R9H7G
-t4pE/JWaTifssOdJwFJ+F0eTR0h142z9FNYk8xX03MqZvy0fn9FKHacgnQwcxmi3
-90AktGPVIOEmTXtRblrEdbhfdBO2xBHFjF8OAxF7upynyHL8jFvJWs6w09d2C7ED
-NdnQp4QYJyd0Si/Wh+p+BqRw51AYO1hD829MZ8RwRTOx+6jX3OOMoakZfFb3N7wI
-wjFhJ4hGBBMRAgAGBQJV2yvsAAoJEEBeC+De1+v6IgUAoMMoIi5I/6E9E7ptCS+m
-KxSlUhJ5AJ4rBchfkK22BoPCnE0ErHBlVPN6cw==
-=Y033
------END PGP PUBLIC KEY BLOCK-----
diff --git a/core/platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in b/core/platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in
index a34971a842d..4c91d62463b 100644
--- a/core/platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in
+++ b/core/platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list.in
@@ -11,25 +11,15 @@ password = configRegistry.get('bareos/subscription/password', '')
 if username and password:
 
     bareos_major_version  = @BAREOS_VERSION_MAJOR@.@BAREOS_VERSION_MINOR@
-    #bareos_sign_key_id = 'F93C028C093BFBA2'
 
     ucs_version = configRegistry.get('version/version')
     bareos_univention_dist = '@OBS_DISTRIBUTION@'
 
-    #
-    # example:
-    #   http://download.bareos.com/bareos/release/15.2/Univention_4.0/
-    # https does not work on UCS 4.0, even if apt-transport-https is installed.
-    # With UCS 4.2, https can and will be used.
-    #
     bareos_com_url = "https://{username}:{password}@download.bareos.com/bareos/release/{version}/{dist}".format(username=quote(username), password=password, version=bareos_major_version, dist=bareos_univention_dist)
 
-    # import the bareos signing key from a keyserver (does work, if internet connection is available)
-    #cmd = subprocess.Popen(['apt-key', 'adv', '--keyserver', 'pool.sks-keyservers.net', '--recv-key', bareos_sign_key_id], stdout=sys.stderr, stderr=sys.stderr)
     sys.stderr.write("importing bareos.com release key: ")
-    cmd = subprocess.Popen(['apt-key', 'add', '/etc/bareos/bareos-com-release.key'], stdout=sys.stderr, stderr=sys.stderr)
+    cmd = subprocess.Popen(['apt-key', 'add', '/etc/bareos/bareos-release.key'], stdout=sys.stderr, stderr=sys.stderr)
     rc = cmd.wait()
-    #sys.stderr.write("rc=" + str(rc) + "\n")
 
     print "deb {url} /".format(url=bareos_com_url)
 
diff --git a/core/platforms/univention/get_bareos_release_key.sh.in b/core/platforms/univention/get_bareos_release_key.sh.in
deleted file mode 100755
index 246bb801bb5..00000000000
--- a/core/platforms/univention/get_bareos_release_key.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DEST=${1:-bareos-com-release.key}
-
-if [ -z "@OBS_DISTRIBUTION@" ]; then
-    echo "OBS_DISTRIBUTION not defined, skipped."
-    exit 0
-fi
-
-# use bareos.org Release.key,
-# as it is identical with the bareos.com key and we do not require a authentication.
-URL_BRANCH="http://download.bareos.org/bareos/release/@MAJOR_VERSION@/@OBS_DISTRIBUTION@/Release.key"
-URL_MASTER="http://download.bareos.org/bareos/experimental/nightly/@OBS_DISTRIBUTION@/Release.key"
-
-wget -O "$DEST" "$URL_BRANCH" || wget -O "$DEST" "$URL_MASTER"
-exit $?
-