diff --git a/.drone.jsonnet b/.drone.jsonnet
index 6eb144b..930075d 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -59,13 +59,16 @@ local PipelineBuildContainer(arch='amd64') = {
     {
       name: 'publish-dockerhub',
       image: 'thegeeklab/drone-docker-buildx:20',
+      environment: {
+        BUILD_DATE: '$$(date --rfc-3339=seconds)',
+      },
       settings: {
         dockerfile: 'Dockerfile.' + std.split(arch, '_')[0],
         repo: 'thegeeklab/${DRONE_REPO_NAME}',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
-        build_args: [
-          'BUILD_DATE=$(date --rfc-3339=seconds)',
+        build_args_from_env: [
+          'BUILD_DATE',
         ],
       },
       when: {
diff --git a/.drone.yml b/.drone.yml
index a50e225..c050c47 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -57,14 +57,16 @@ steps:
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx:20
   settings:
-    build_args:
-    - BUILD_DATE=$(date --rfc-3339=seconds)
+    build_args_from_env:
+    - BUILD_DATE
     dockerfile: Dockerfile.amd64
     password:
       from_secret: docker_password
     repo: thegeeklab/${DRONE_REPO_NAME}
     username:
       from_secret: docker_username
+  environment:
+    BUILD_DATE: $$(date --rfc-3339=seconds)
   when:
     ref:
     - refs/heads/main
@@ -137,14 +139,16 @@ steps:
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx:20
   settings:
-    build_args:
-    - BUILD_DATE=$(date --rfc-3339=seconds)
+    build_args_from_env:
+    - BUILD_DATE
     dockerfile: Dockerfile.arm64
     password:
       from_secret: docker_password
     repo: thegeeklab/${DRONE_REPO_NAME}
     username:
       from_secret: docker_username
+  environment:
+    BUILD_DATE: $$(date --rfc-3339=seconds)
   when:
     ref:
     - refs/heads/main
@@ -217,14 +221,16 @@ steps:
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx:20
   settings:
-    build_args:
-    - BUILD_DATE=$(date --rfc-3339=seconds)
+    build_args_from_env:
+    - BUILD_DATE
     dockerfile: Dockerfile.arm
     password:
       from_secret: docker_password
     repo: thegeeklab/${DRONE_REPO_NAME}
     username:
       from_secret: docker_username
+  environment:
+    BUILD_DATE: $$(date --rfc-3339=seconds)
   when:
     ref:
     - refs/heads/main
@@ -352,6 +358,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: febb88c7bfa032ad940f78861ccf99bca894565aadf926913cc132f7fa9932d7
+hmac: 478b279e928c111b85864329aa2aa6744e5d77f9a7b7ddbaee1fdd388cda83b8
 
 ...