diff --git a/files/etc/hampi-release b/files/etc/hampi-release
index 6aaf048..ab24fd2 100644
--- a/files/etc/hampi-release
+++ b/files/etc/hampi-release
@@ -1,4 +1,4 @@
-PRETTY_NAME="HamPi 3.0 (May 2022)"
+PRETTY_NAME="HamPi 3.0 64-bit (May 2022)"
 NAME="HamPi"
 VERSION_ID="3,0"
 VERSION="3.0 (May 2022)"
diff --git a/tasks/install_lopora.yml b/tasks/install_lopora.yml
index 58fbb8e..33fae8f 100644
--- a/tasks/install_lopora.yml
+++ b/tasks/install_lopora.yml
@@ -61,6 +61,9 @@
 
   - name: Copy Lopora desktop file
     become: yes
-    copy:
-      src: "{{ playbook_dir }}/../files/usr/local/share/applications/lopora.desktop"
+    template:
+      src: "{{ playbook_dir }}/../templates/usr/local/share/applications/lopora.desktop.j2"
       dest: "/usr/local/share/applications/lopora.desktop"
+      owner: root
+      group: root
+      mode: 0644
diff --git a/tasks/install_noaa_apt.yml b/tasks/install_noaa_apt.yml
index 6a0630d..6986760 100644
--- a/tasks/install_noaa_apt.yml
+++ b/tasks/install_noaa_apt.yml
@@ -53,9 +53,12 @@
 
   - name: Copy noaa-apt desktop file
     become: yes
-    copy:
-      src: "{{ playbook_dir }}/../files/usr/local/share/applications/noaa-apt.desktop"
+    template:
+      src: "{{ playbook_dir }}/../files/usr/local/share/applications/noaa-apt.desktop.j2"
       dest: "/usr/local/share/applications/noaa-apt.desktop"
+      owner: root
+      group: root
+      mode: 0644
 
   - name: Remove RUST installer
     file: dest=/tmp/initrust.sh state=absent
diff --git a/files/usr/local/bin/update_d-rats b/templates/usr/local/bin/update_d-rats
similarity index 91%
rename from files/usr/local/bin/update_d-rats
rename to templates/usr/local/bin/update_d-rats
index d45e5bf..24a91aa 100755
--- a/files/usr/local/bin/update_d-rats
+++ b/templates/usr/local/bin/update_d-rats
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cd /home/hampi/hamradio/D-Rats/
+cd /home/{{ ham_user }}/hamradio/D-Rats/
 if [ $? != 0 ]; then
   echo "Updating D-Rats failed. (cd)"
   exit $?
diff --git a/files/usr/local/share/applications/lopora.desktop b/templates/usr/local/share/applications/lopora.desktop.j2
similarity index 70%
rename from files/usr/local/share/applications/lopora.desktop
rename to templates/usr/local/share/applications/lopora.desktop.j2
index 50f7579..a33a366 100644
--- a/files/usr/local/share/applications/lopora.desktop
+++ b/templates/usr/local/share/applications/lopora.desktop.j2
@@ -4,8 +4,8 @@ Version=1.0
 Name=Lopora
 GenericName=QRSS Beacon Reception
 Comment=Lopora is a QRSS Beacon Reception program
-Exec=/home/pi/lopora/scriptfiles/quickstartlopora-pi.sh
-Path=/home/pi/lopora
+Exec=/home/{{ ham_user}}/lopora/scriptfiles/quickstartlopora-pi.sh
+Path=/home/{{ ham_user}}/lopora
 Terminal=false
 StartupNotify=true
 Categories=Utility;HamRadio
diff --git a/files/usr/local/share/applications/noaa-apt.desktop b/templates/usr/local/share/applications/noaa-apt.desktop.j2
similarity index 53%
rename from files/usr/local/share/applications/noaa-apt.desktop
rename to templates/usr/local/share/applications/noaa-apt.desktop.j2
index 1fdeb87..bae7ced 100644
--- a/files/usr/local/share/applications/noaa-apt.desktop
+++ b/templates/usr/local/share/applications/noaa-apt.desktop.j2
@@ -2,9 +2,9 @@
 Name=NOAA Apt Image Decoder
 GenericName=NOAA Apt Image Decoder
 Comment=Image decoder for APT signals from NOAA satellites
-Exec=/home/pi/hamradio/noaa-apt/target/release/noaa-apt
-Path=/home/pi/hamradio/noaa-apt
-Icon=/home/pi/hamradio/noaa-apt/res/icon.png
+Exec=/home/{{ ham_user}}/hamradio/noaa-apt/target/release/noaa-apt
+Path=/home/{{ ham_user}}/hamradio/noaa-apt
+Icon=/home/{{ ham_user}}/hamradio/noaa-apt/res/icon.png
 Terminal=false
 Type=Application
 Categories=HamRadio