diff --git a/.github/workflows/charm-release.yaml b/.github/workflows/charm-release.yaml
index 2a46cdbd4..589f471d1 100644
--- a/.github/workflows/charm-release.yaml
+++ b/.github/workflows/charm-release.yaml
@@ -38,6 +38,7 @@ jobs:
           channel: "1/edge"
           charm-path: "./charms/jimm-k8s"
           local-image: "true"
+          tag-prefix: "v1-k8s"
 
   release-machine-charm:
     name: Release machine charm
@@ -66,3 +67,4 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           channel: "1/edge"
           charm-path: "./charms/jimm"
+          tag-prefix: "v1-machine"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f4c0a9c9a..f2addd809 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,9 +1,12 @@
 name: CI
 on:
   pull_request:
+    paths-ignore:
+      - '.github/**'  # Skip this workflow if the only change was inside the .github folder
   workflow_call:
   workflow_dispatch:
 
+
 jobs:
   # lint:
   #   runs-on: ubuntu-20.04
diff --git a/.github/workflows/ci_skip.yaml b/.github/workflows/ci_skip.yaml
new file mode 100644
index 000000000..e11a0cff2
--- /dev/null
+++ b/.github/workflows/ci_skip.yaml
@@ -0,0 +1,14 @@
+name: CI
+on:
+  pull_request:
+    paths:
+      - '.github/**'  # Run this workflow when the only files changed were any in .github
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  build_test:
+    name: Build and Test
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'