diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index 8f64dd1..6f89370 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main
+    uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@fix-lxd-guest-pro-attach
     with:
       owner: ${{ github.repository_owner }}
       trivy-image-config: "trivy.yaml"
@@ -24,7 +24,6 @@ jobs:
       arch-skipping-maximize-build-space: '["arm64", "amd64"]'
       platform-labels: '{"arm64": ["self-hosted", "linux", "arm64", "jammy", "xlarge"], "amd64": ["self-hosted", "linux", "amd64", "jammy", "xlarge"]}'
       enabled-ubuntu-pro-features: "fips-updates"
-      rockcraft-revisions: '{"amd64": "3494", "arm64": "3547"}'
     secrets:
       UBUNTU_PRO_TOKEN: ${{ secrets.UBUNTU_PRO_TOKEN }}
   run-tests:
diff --git a/.rockcraft-version.yaml b/1.15.2/cilium-operator-generic/.rockcraft-version.yaml
similarity index 53%
rename from .rockcraft-version.yaml
rename to 1.15.2/cilium-operator-generic/.rockcraft-version.yaml
index 646d125..2290d75 100644
--- a/.rockcraft-version.yaml
+++ b/1.15.2/cilium-operator-generic/.rockcraft-version.yaml
@@ -1,5 +1,5 @@
 versions:
   - architecture: amd64
-    revision: 3494
+    channel: latest/edge
   - architecture: arm64
-    revision: 3547
+    channel: latest/edge
diff --git a/1.15.2/cilium/.rockcraft-version.yaml b/1.15.2/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.15.2/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.3/cilium-operator-generic/.rockcraft-version.yaml b/1.16.3/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.3/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.3/cilium/.rockcraft-version.yaml b/1.16.3/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.3/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.5/cilium-operator-generic/.rockcraft-version.yaml b/1.16.5/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.5/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.5/cilium/.rockcraft-version.yaml b/1.16.5/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.5/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.7/cilium-operator-generic/.rockcraft-version.yaml b/1.16.7/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.7/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.16.7/cilium/.rockcraft-version.yaml b/1.16.7/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.16.7/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.1/cilium-operator-generic/.rockcraft-version.yaml b/1.17.1/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.1/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.1/cilium/.rockcraft-version.yaml b/1.17.1/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.1/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.12/cilium-operator-generic/.rockcraft-version.yaml b/1.17.12/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.12/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.12/cilium/.rockcraft-version.yaml b/1.17.12/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.12/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.9/cilium-operator-generic/.rockcraft-version.yaml b/1.17.9/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.9/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.17.9/cilium/.rockcraft-version.yaml b/1.17.9/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.17.9/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.18.4/cilium-operator-generic/.rockcraft-version.yaml b/1.18.4/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.18.4/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.18.4/cilium/.rockcraft-version.yaml b/1.18.4/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.18.4/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.19.4/cilium-operator-generic/.rockcraft-version.yaml b/1.19.4/cilium-operator-generic/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.19.4/cilium-operator-generic/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge
diff --git a/1.19.4/cilium/.rockcraft-version.yaml b/1.19.4/cilium/.rockcraft-version.yaml
new file mode 100644
index 0000000..2290d75
--- /dev/null
+++ b/1.19.4/cilium/.rockcraft-version.yaml
@@ -0,0 +1,5 @@
+versions:
+  - architecture: amd64
+    channel: latest/edge
+  - architecture: arm64
+    channel: latest/edge