diff --git a/.github/workflows/charm-release.yaml b/.github/workflows/charm-release.yaml
index 54f4e843c..2a46cdbd4 100644
--- a/.github/workflows/charm-release.yaml
+++ b/.github/workflows/charm-release.yaml
@@ -1,10 +1,10 @@
-name: Release to latest/edge
+name: Release to v1/edge
 
 on:
   workflow_dispatch:
   push:
     tags:
-      - 'v*'
+      - 'v1*'
 
 # Note this workflow requires a Github secret to provide auth against charmhub.
 # This can be generated with the following command
@@ -35,7 +35,7 @@ jobs:
         with:
           credentials: "${{ secrets.CHARMHUB_TOKEN }}"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-          channel: "v1/edge"
+          channel: "1/edge"
           charm-path: "./charms/jimm-k8s"
           local-image: "true"
 
@@ -54,9 +54,9 @@ jobs:
         with:
           name: jimm-snap
       - name: Install charmcraft
-        run: sudo snap install charmcraft --channel=2.x/stable
+        run: sudo snap install charmcraft --channel=2.x/stable --classic
       - name: Publish Charm Resource
-        run: charmcraft upload-resource juju-jimm jimm-snap --filepath ./jimm-snap
+        run: charmcraft upload-resource juju-jimm jimm-snap --filepath ./jimm.snap
         env:
           CHARMCRAFT_AUTH: "${{ secrets.CHARMHUB_TOKEN }}"
       - name: Upload charm to charmhub
@@ -64,5 +64,5 @@ jobs:
         with:
           credentials: "${{ secrets.CHARMHUB_TOKEN }}"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-          channel: "v1/edge"
+          channel: "1/edge"
           charm-path: "./charms/jimm"
diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml
index 8c4fde36d..589476977 100644
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -19,7 +19,7 @@ jobs:
       - run: sudo snap install snapcraft --channel=7.x/stable --classic
       - run: mkdir -p snap
       - run: cp ./snaps/jimm/snapcraft.yaml ./snap/snapcraft.yaml
-      - run: snapcraft --destructive-mode
+      - run: snapcraft snap --destructive-mode --output jimm.snap
       - uses: actions/upload-artifact@v3
         with:
           name: jimm-snap