diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0339d21..467326c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,13 +18,7 @@ jobs:
           sudo snap install yq
           sudo snap install rockcraft --classic --edge
       - name: Build ROCK
-        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
-          rockcraft pack
+        run: rockcraft pack
       - name: Upload locally built ROCK artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index f35af01..6d56757 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Import and push to GHCR
         run: |
           version=$(yq '(.version|split("-"))[0]' 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:charmed-postgresql_${tag}_amd64.rock \
diff --git a/rockcraft.yaml b/rockcraft.yaml
index e460291..485ffdb 100644
--- a/rockcraft.yaml
+++ b/rockcraft.yaml
@@ -1,5 +1,5 @@
 name: charmed-postgresql # 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: '14.9' # just for humans. Semantic versioning is recommended
 summary: PostgreSQL in a ROCK. # 79 char long summary
 description: |