diff --git a/.drone.yml b/.drone.yml
index c2e1572..e499609 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,17 +1,35 @@
----
 kind: pipeline
 type: kubernetes
-name: Publish
+name: PR Build
 
 trigger:
   event:
-    - cron
     - push
-  branch:
-    - trunk
+    - cron
+
+steps:
+  - name: Build & Publish
+    image: plugins/kaniko
+    settings:
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: vdhsn/garden
+      tags:
+        - ${DRONE_COMMIT_SHA}
+        - ${DRONE_BRANCH}
+---
+kind: pipeline
+type: kubernetes
+name: Deploy
+
+trigger:
+  event:
+  - promote
 
 steps:
-  - name: kaniko
+  - name: Publish Latest
     image: plugins/kaniko
     settings:
       username:
diff --git a/Dockerfile b/Dockerfile
index 0e6e236..1b02673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ RUN apk add --no-cache git hugo make && make build
 
 FROM nginx
 
-ARG SHA = "local-dev"
-ARG BUILD_DATE = "03-11-2022"
+# ARG SHA "local-dev"
+# ARG BUILD_DATE "03-11-2022"
 
 LABEL org.opencontainers.image.created ${BUILD_DATE}
 LABEL org.opencontainers.image.source https://git.vdhsn.com/adam/garden.git