diff --git a/.drone.jsonnet b/.drone.jsonnet
index ebee35a..861faf2 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -173,7 +173,7 @@ local PipelineBuildContainer(arch="amd64") = {
     },
     {
       name: "dryrun",
-      image: "plugins/docker:linux-" + arch,
+      image: "plugins/docker:18-linux-" + arch,
       pull: "always",
       settings: {
         dry_run: true,
@@ -188,7 +188,7 @@ local PipelineBuildContainer(arch="amd64") = {
     },
     {
       name: "publish",
-      image: "plugins/docker:linux-" + arch,
+      image: "plugins/docker:18-linux-" + arch,
       pull: "always",
       settings: {
         auto_tag: true,
diff --git a/.drone.yml b/.drone.yml
index 6ecfdb9..835efd9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -194,7 +194,7 @@ steps:
 
 - name: dryrun
   pull: always
-  image: plugins/docker:linux-amd64
+  image: plugins/docker:18-linux-amd64
   settings:
     dockerfile: Dockerfile
     dry_run: true
@@ -209,7 +209,7 @@ steps:
 
 - name: publish
   pull: always
-  image: plugins/docker:linux-amd64
+  image: plugins/docker:18-linux-amd64
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -250,7 +250,7 @@ steps:
 
 - name: dryrun
   pull: always
-  image: plugins/docker:linux-arm64
+  image: plugins/docker:18-linux-arm64
   settings:
     dockerfile: Dockerfile
     dry_run: true
@@ -265,7 +265,7 @@ steps:
 
 - name: publish
   pull: always
-  image: plugins/docker:linux-arm64
+  image: plugins/docker:18-linux-arm64
   settings:
     auto_tag: true
     auto_tag_suffix: arm64
@@ -306,7 +306,7 @@ steps:
 
 - name: dryrun
   pull: always
-  image: plugins/docker:linux-arm
+  image: plugins/docker:18-linux-arm
   settings:
     dockerfile: Dockerfile
     dry_run: true
@@ -321,7 +321,7 @@ steps:
 
 - name: publish
   pull: always
-  image: plugins/docker:linux-arm
+  image: plugins/docker:18-linux-arm
   settings:
     auto_tag: true
     auto_tag_suffix: arm
@@ -423,6 +423,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 1de34e36b19655755ede9fa231224c029cb6a7acfc773dcd544bf3a758672302
+hmac: 24cc5ebb0319158e48a67f6433b0712b02ed5e50cd7fcb3ec0a9651d0e0d6c6a
 
 ...
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04f2f95..5708b8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* BREAKING
+  * rename `base_dir` parameter to `role_dir`
 * BUGFIX
   * raise exception if template dir not accessable
   * better log level parsing and error handling for log settings