diff --git a/client-py3/full/linux/Makefile b/client-py3/full/linux/Makefile
index 236a8bac..653d8694 100644
--- a/client-py3/full/linux/Makefile
+++ b/client-py3/full/linux/Makefile
@@ -57,6 +57,8 @@ ifeq ($(DISTRO),x86_64)
 else
 	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g | sed -e s/amd64\\\|x86_64/armhf/g > appimage.recipe
 endif
+# In case of error, continue
+	-rm -rf appimage appimage-builder-cache /tmp/UDSClientDir
 
 	appimage-builder --recipe appimage.recipe
 # Now create dist and move appimage
diff --git a/client-py3/full/linux/build-packages.sh b/client-py3/full/linux/build-packages.sh
index c9389a36..08de5d18 100755
--- a/client-py3/full/linux/build-packages.sh
+++ b/client-py3/full/linux/build-packages.sh
@@ -39,8 +39,9 @@ done
 make DESTDIR=targz DISTRO=targz VERSION=${VERSION} install
 
 # And make FULL CLIENT .tar.gz for x86 and raspberry
-make DESTDIR=appimage DISTRO=x86_64 VERSION=${VERSION} build-appimage-x86_64
-make DESTDIR=appimage DISTRO=armhf VERSION=${VERSION} build-appimage-x86_64
+make DESTDIR=appimage DISTRO=x86_64 VERSION=${VERSION} build-appimage
+
+make DESTDIR=appimage DISTRO=armhf VERSION=${VERSION} build-appimage
 
 
 rpm --addsign ../*rpm
diff --git a/client-py3/full/linux/udsclient-appimage-x86_64.recipe b/client-py3/full/linux/udsclient-appimage-x86_64.recipe
index dbe73310..dd28e10a 100644
--- a/client-py3/full/linux/udsclient-appimage-x86_64.recipe
+++ b/client-py3/full/linux/udsclient-appimage-x86_64.recipe
@@ -14,7 +14,8 @@ script:
   - rm UDSClientDir/usr/src/uds/__pycache__ -rf 2>&1 > /dev/null
 
 AppDir:
-  path: ./UDSClientDir
+  # On /tmp, that is an ext4 filesystem. On btrfs squashfs complains with "Unrecognised xattr prefix btrfs.compression"
+  path: /tmp/UDSClientDir
 
   app_info:
     id: com.udsenterprise.UDSClient3
@@ -39,7 +40,9 @@ AppDir:
       - python3-paramiko
       - python3-cryptography
       - freerdp2-x11
+      - freerdp2-wayland
       - x2goclient
+      - openssh-sftp-server
     exclude: []
 
   runtime: