diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 500a7fc..6fb4ef8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -5,8 +5,6 @@ description: charmstore-client and charm-tools
 confinement: classic
 grade: stable
 base: core18
-architectures:
-  - amd64
 apps:
   charm:
     command: bin/wrappers/charm
@@ -24,7 +22,7 @@ parts:
       - bzr
       - python3-pip
     stage-snaps:
-      - bhttp
+      - bhttp/latest/edge
     override-build: |
       snapcraftctl build
       pip3 install vergit
@@ -32,7 +30,7 @@ parts:
   bhttp:
     plugin: nil
     stage-snaps:
-      - bhttp
+      - bhttp/latest/edge
     stage:
       - bin/bhttp
   charm-tools: