diff --git a/bin/subiquity-cmd b/bin/subiquity-cmd
new file mode 100755
index 00000000..9d4838c8
--- /dev/null
+++ b/bin/subiquity-cmd
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export PYTHONPATH=$PYTHONPATH:$SNAP/lib/python3.8/site-packages
+$PYTHON -m subiquity "$@"
diff --git a/setup.py b/setup.py
index a1d4c48d..f8b5cebc 100644
--- a/setup.py
+++ b/setup.py
@@ -112,6 +112,7 @@ setup(name='subiquity',
           'bin/subiquity-loadkeys',
           'bin/subiquity-service',
           'bin/subiquity-server',
+          'bin/subiquity-cmd',
       ],
       entry_points={
           'console_scripts': [
diff --git a/snapcraft.yaml b/snapcraft.yaml
index ca3aac2b..71e8ccdf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,10 +7,11 @@ confinement: classic
 
 apps:
   subiquity:
-    command: usr/bin/subiquity
+    command: usr/bin/subiquity-cmd
     environment:
       PYTHONIOENCODING: utf-8
       SUBIQUITY_ROOT: $SNAP
+      PYTHON: $SNAP/usr/bin/python3.8
   probert:
     command: bin/probert
   subiquity-server:
@@ -119,6 +120,7 @@ parts:
       'bin/subiquity-tui': usr/bin/subiquity
       'bin/subiquity-service': usr/bin/subiquity-service
       'bin/subiquity-server': usr/bin/subiquity-server
+      'bin/subiquity-cmd': usr/bin/subiquity-cmd
   users-and-groups:
     plugin: nil
     build-packages: