diff --git a/.woodpecker/publish-release-plz-image.yml b/.woodpecker/publish-release-plz-image.yml
index aa915f2..f3b9365 100644
--- a/.woodpecker/publish-release-plz-image.yml
+++ b/.woodpecker/publish-release-plz-image.yml
@@ -2,7 +2,7 @@ when:
   event: [push, manual]
   branch: main
   path:
-    ["release-plz/base.Dockerfile", ".woodpecker/publish-release-plz-image.yml"]
+    ["rust/release-plz.Dockerfile", ".woodpecker/publish-release-plz-image.yml"]
 
 steps:
   build-latest-container:
@@ -13,5 +13,5 @@ steps:
       password:
         from_secret: CONTAINER_REGISTRY_TOKEN
       repo: codeberg.org/jasterv/release-plz
-      dockerfile: "release-plz/base.Dockerfile"
+      dockerfile: "rust/release-plz.Dockerfile"
       tags: 0.3.156,0.3,latest
diff --git a/.woodpecker/publish-release-plz-update-pr-image.yml b/.woodpecker/publish-release-plz-update-pr-image.yml
index 3314685..60bd3f5 100644
--- a/.woodpecker/publish-release-plz-update-pr-image.yml
+++ b/.woodpecker/publish-release-plz-update-pr-image.yml
@@ -3,8 +3,8 @@ when:
   branch: main
   path:
     [
-      "release-plz/update-pr.Dockerfile",
-      "release-plz/update-pr.sh",
+      "rust/release-plz-update-pr.Dockerfile",
+      "rust/scripts/update-pr.sh",
       ".woodpecker/publish-release-plz-update-pr-image.yml",
     ]
 
@@ -17,5 +17,5 @@ steps:
       password:
         from_secret: CONTAINER_REGISTRY_TOKEN
       repo: codeberg.org/jasterv/release-plz-update-pr
-      dockerfile: "release-plz/update-pr.Dockerfile"
+      dockerfile: "rust/release-plz-update-pr.Dockerfile"
       tags: 0.3.156,0.3,latest
diff --git a/.woodpecker/publish-rust-magic-release-image.yml b/.woodpecker/publish-rust-magic-release-image.yml
index 923c235..c8d225b 100644
--- a/.woodpecker/publish-rust-magic-release-image.yml
+++ b/.woodpecker/publish-rust-magic-release-image.yml
@@ -4,7 +4,7 @@ when:
   path:
     [
       "rust/magic-release.Dockerfile",
-      "rust/magic-release.sh",
+      "rust/scripts/magic-release.sh",
       ".woodpecker/publish-rust-magic-release-image.yml",
     ]
 
diff --git a/rust/magic-release.Dockerfile b/rust/magic-release.Dockerfile
index c82f12d..f3a6373 100644
--- a/rust/magic-release.Dockerfile
+++ b/rust/magic-release.Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache \
     gcc \
     jq
 
-COPY rust/magic-release.sh /usr/local/bin/magic-release
+COPY rust/scripts/magic-release.sh /usr/local/bin/magic-release
 
 RUN chmod +x /usr/local/bin/magic-release
 
diff --git a/release-plz/update-pr.Dockerfile b/rust/release-plz-update-pr.Dockerfile
similarity index 74%
rename from release-plz/update-pr.Dockerfile
rename to rust/release-plz-update-pr.Dockerfile
index de5db0e..c66dccf 100644
--- a/release-plz/update-pr.Dockerfile
+++ b/rust/release-plz-update-pr.Dockerfile
@@ -1,6 +1,6 @@
 FROM jasterv/release-plz:0.3.156
 
-COPY release-plz/update-pr.sh /usr/local/bin/update-pr
+COPY rust/scripts/update-pr.sh /usr/local/bin/update-pr
 
 RUN chmod +x /usr/local/bin/update-pr
 
diff --git a/release-plz/base.Dockerfile b/rust/release-plz.Dockerfile
similarity index 100%
rename from release-plz/base.Dockerfile
rename to rust/release-plz.Dockerfile
diff --git a/rust/magic-release.sh b/rust/scripts/magic-release.sh
similarity index 100%
rename from rust/magic-release.sh
rename to rust/scripts/magic-release.sh
diff --git a/release-plz/update-pr.sh b/rust/scripts/update-pr.sh
similarity index 100%
rename from release-plz/update-pr.sh
rename to rust/scripts/update-pr.sh