diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a66e140bf..08b43e7e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,11 @@ jobs:
         working-directory: build
         run: make -j4
       - name: Validate desktop entry
-        run: desktop-file-validate gqrx.desktop
+        if: matrix.os == 'ubuntu-20.04'
+        run: desktop-file-validate dk.gqrx.gqrx.desktop
       - name: Validate appstream metadata
-        run: appstreamcli validate gqrx.appdata.xml
+        if: matrix.os == 'ubuntu-20.04'
+        run: appstreamcli validate dk.gqrx.gqrx.appdata.xml
   macos-build:
     name: MacOS CI
     strategy:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb640a10..14d7aaf1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,10 +261,10 @@ if(Gnuradio_VERSION VERSION_LESS "3.8")
 endif()
 
 # Install desktop
-install(FILES gqrx.desktop DESTINATION share/applications)
+install(FILES dk.gqrx.gqrx.desktop DESTINATION share/applications)
 
 # Install appstream / metainfo file
-install(FILES gqrx.appdata.xml DESTINATION share/metainfo)
+install(FILES dk.gqrx.gqrx.appdata.xml DESTINATION share/metainfo)
 
 # Install icon
 install(FILES resources/icons/gqrx.svg DESTINATION share/icons/hicolor/scalable/apps)
diff --git a/appimage.sh b/appimage.sh
index fed295575..299e2e404 100755
--- a/appimage.sh
+++ b/appimage.sh
@@ -24,7 +24,7 @@
 APP="build/src/gqrx"
 
 # No need to tweak below unless you move files on the actual project
-DESKTOP="gqrx.desktop"
+DESKTOP="dk.gqrx.gqrx.desktop"
 ICON="resources/icons/gqrx.svg"
 
 # clean log space
diff --git a/gqrx.appdata.xml b/dk.gqrx.gqrx.appdata.xml
similarity index 94%
rename from gqrx.appdata.xml
rename to dk.gqrx.gqrx.appdata.xml
index 8a3773244..e27455f40 100644
--- a/gqrx.appdata.xml
+++ b/dk.gqrx.gqrx.appdata.xml
@@ -28,5 +28,6 @@
       <image width="1850" height="1055">https://raw.githubusercontent.com/gqrx-sdr/gqrx/master/resources/screenshots/gqrx-main.png</image>
     </screenshot>
   </screenshots>
-  <update_contact>daveo@fedoraproject.org</update_contact>
+  <content_rating type="oars-1.1" />
+  <update_contact>argilo@gmail.com</update_contact>
 </component>
diff --git a/gqrx.desktop b/dk.gqrx.gqrx.desktop
similarity index 100%
rename from gqrx.desktop
rename to dk.gqrx.gqrx.desktop
diff --git a/resources/news.txt b/resources/news.txt
index 4735fdc11..bbd326d46 100644
--- a/resources/news.txt
+++ b/resources/news.txt
@@ -1,4 +1,9 @@
 
+    2.15.7: In progress...
+
+     FIXED: Errors & warnings in appstream metadata & desktop entry.
+
+
     2.15.6: Released January 22, 2022
 
   IMPROVED: Install icon, desktop entry, and appstream metadata.