diff --git a/snapcraft.yaml b/snapcraft.yaml
index b3ed2ae7..bdaddad4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -80,23 +80,23 @@ parts:
       - requests
       - requests-unixsocket
     organize:
-      'lib/python*/site-packages/usr/lib/curtin': 'usr/lib/'
+      lib/python*/site-packages/usr/lib/curtin: usr/lib/
     stage:
-     - "*"
-     - "-lib/python*/site-packages/_yaml.*.so"
-     - "-lib/python*/site-packages/setuptools"
-     - "-lib/python*/site-packages/pip"
-     - "-lib/python*/site-packages/pkg_resources"
-     - "-lib/python*/site-packages/jsonschema"
-     - "-lib/python*/site-packages/wheel*"
-     - "-lib/python*/site-packages/probert"
-     - "-bin/activate*"
-     - -bin/python
-     - -bin/python3*
-     - "-lib/python3.8/site-packages/__pycache__/six.cpython*"
-     - "-lib/python3.8/site-packages/pip-*.dist-info/RECORD"
-     - "-lib/python3.8/site-packages/wheel-*.dist-info/RECORD"
-     - "-lib/python3.8/site-packages/_distutils_hack"
+      - '*'
+      - -lib/python*/site-packages/_yaml.*.so
+      - -lib/python*/site-packages/setuptools
+      - -lib/python*/site-packages/pip
+      - -lib/python*/site-packages/pkg_resources
+      - -lib/python*/site-packages/jsonschema
+      - -lib/python*/site-packages/wheel*
+      - -lib/python*/site-packages/probert
+      - -bin/activate*
+      - -bin/python
+      - -bin/python3*
+      - -lib/python3.8/site-packages/__pycache__/six.cpython*
+      - -lib/python3.8/site-packages/pip-*.dist-info/RECORD
+      - -lib/python3.8/site-packages/wheel-*.dist-info/RECORD
+      - -lib/python3.8/site-packages/_distutils_hack
   subiquity:
     plugin: python
     build-packages:
@@ -138,18 +138,18 @@ parts:
       - python3-pyudev
       - ubuntu-advantage-tools
     stage:
-      - "*"
+      - '*'
       - -bin/python
       - -bin/python3
     source: .
     source-type: git
     build-environment:
-      - PATH: "/usr/bin:$PATH"
+      - PATH: /usr/bin:$PATH
     organize:
-      '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
+      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:
@@ -209,7 +209,7 @@ parts:
     source-commit: 31778895be3002422e9e8758d42940f290dc70af
     requirements: [requirements.txt]
     stage:
-      - "*"
+      - '*'
       - -bin/python
       - -bin/python3*
       - -bin/activate*