diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8865648..9c1a5dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,9 +25,7 @@ jobs:
         run: |
           app_version=$(yq '.version' rockcraft.yaml)
           version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
-          base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
-          tag=${version}-${base}_edge
-          sed -i "s/${app_version}/${tag}/g" rockcraft.yaml
+          base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           rockcraft pack
       - name: Upload rockcraft logs
         if: ${{ failure() && steps.pack.outcome == 'failure' }}
diff --git a/.github/workflows/check_version.yaml b/.github/workflows/check_version.yaml
index 9a3a1ee..96fd77d 100644
--- a/.github/workflows/check_version.yaml
+++ b/.github/workflows/check_version.yaml
@@ -8,8 +8,6 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 15
     steps:
-      - name: 'Foresight: Collect workflow telemetry'
-        uses: runforesight/foresight-workflow-kit-action@v1
       - uses: actions/checkout@v3
       - name: Install yq
         run: sudo snap install yq
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index bd62edc..6a2837b 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -33,7 +33,7 @@ jobs:
         with:
           name: charmed-mysql-rock
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USER }}
@@ -42,9 +42,9 @@ jobs:
         run: |
           app=$(yq .name rockcraft.yaml)
           version=$(yq '(.version)' rockcraft.yaml)
-          base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
+          base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           tag=${version}-${base}_edge
           sudo skopeo --insecure-policy copy \
-            oci-archive:${app}_${tag}_amd64.rock \
+            oci-archive:${app}_${version}_amd64.rock \
             docker-daemon:ghcr.io/canonical/${app}:${tag}
           docker push ghcr.io/canonical/${app}:${tag}
diff --git a/rockcraft.yaml b/rockcraft.yaml
index 712ff1d..5750eb0 100644
--- a/rockcraft.yaml
+++ b/rockcraft.yaml
@@ -1,5 +1,5 @@
 name: charmed-mysql # the name of your ROCK
-base: ubuntu:22.04 # the base environment for this ROCK
+base: ubuntu@22.04 # the base environment for this ROCK
 version: '8.0.34' # just for humans. Semantic versioning is recommended
 summary: Charmed MySQL ROCK OCI # 79 char long summary
 description: |