diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 8fa2d52..ac641ac 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -45,12 +45,6 @@ build() {
     sed 's:/sbin/ip:ip:g' -i network/*
     sed 's:/bin/grep:grep:g' -i network/*
 
-    # Force running all scripts with python2
-    sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i misc/*
-    sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i misc/*
-    sed 's:^#!/usr/bin/python.*:#!/usr/bin/python2:' -i qubes-rpc/*
-    sed 's:^#!/usr/bin/env python.*:#!/usr/bin/env python2:' -i qubes-rpc/*
-
     # Fix for archlinux sbindir
     sed 's:/usr/sbin/ntpdate:/usr/bin/ntpdate:g' -i qubes-rpc/sync-ntp-clock
     sed 's:/usr/sbin/qubes-firewall:/usr/bin/qubes-firewall:g' -i vm-systemd/qubes-firewall.service
diff --git a/misc/qubes-desktop-run b/misc/qubes-desktop-run
index 89df349..61de3ee 100755
--- a/misc/qubes-desktop-run
+++ b/misc/qubes-desktop-run
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from qubesagent.xdg import launch
 import sys
diff --git a/misc/qubes-session-autostart b/misc/qubes-session-autostart
index 04a8de3..7c117a8 100644
--- a/misc/qubes-session-autostart
+++ b/misc/qubes-session-autostart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # -*- coding: utf-8 -*-
 #
 # The Qubes OS Project, http://www.qubes-os.org
diff --git a/misc/qvm-features-request b/misc/qvm-features-request
index 9fcc61b..52964d0 100755
--- a/misc/qvm-features-request
+++ b/misc/qvm-features-request
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
 # vim: fileencoding=utf-8
 
 #
diff --git a/misc/yum-qubes-hooks.py b/misc/yum-qubes-hooks.py
index 3224a42..794311b 100644
--- a/misc/yum-qubes-hooks.py
+++ b/misc/yum-qubes-hooks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #
diff --git a/post-install.d/10-qubes-core-agent-features.sh b/post-install.d/10-qubes-core-agent-features.sh
index b3927d5..ac5b9bd 100755
--- a/post-install.d/10-qubes-core-agent-features.sh
+++ b/post-install.d/10-qubes-core-agent-features.sh
@@ -3,6 +3,7 @@
 # announce features supported by this template
 
 qvm-features-request qrexec=1
+qvm-features-request os=Linux
 
 if [ -x /usr/bin/qubes-gui ]; then
     qvm-features-request gui=1
diff --git a/qubes-rpc/qrun-in-vm b/qubes-rpc/qrun-in-vm
index 2f04ed2..266f621 100755
--- a/qubes-rpc/qrun-in-vm
+++ b/qubes-rpc/qrun-in-vm
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Send the command to the remote side, and then transfer stdin from local to
 # remote and stdout from remote to local.
 #
diff --git a/qubes-rpc/xdg-icon b/qubes-rpc/xdg-icon
index 5a981fa..a6a81b5 100755
--- a/qubes-rpc/xdg-icon
+++ b/qubes-rpc/xdg-icon
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 import xdg.IconTheme
 import sys
 import os
diff --git a/qubesagent/xdg.py b/qubesagent/xdg.py
index 744950d..8b57411 100755
--- a/qubesagent/xdg.py
+++ b/qubesagent/xdg.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from gi.repository import Gio  # pylint: disable=import-error
 from gi.repository import GLib  # pylint: disable=import-error
 import sys