diff --git a/.drone.yml b/.drone.yml
index 9282492..1ebea3f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,12 +37,9 @@ steps:
 
 # Build Containers for each architecture
 - name: docker-build-image-amd64
-  image: thegeeklab/drone-docker-buildx
-  volumes:
+  image: plugins/docker # Check Entrypoint  volumes:
   - name: docker_socket
     path: /var/run/docker.sock
-  - name: bin
-    path: /binaries
   privileged: true
   settings:
     username:
@@ -59,12 +56,26 @@ steps:
   depends_on:
     - "go-build-bin-amd64"
 
+# Run go tests
+- name: binary-cleanup
+  image: alpine:latest
+  volumes:
+  - name: bin
+    path: /binaries
+  commands:
+  - rm -rf /binaries/*
+  when:
+    status:
+    - failure
+    - success
+
 # Volumes to mount between steps
 volumes:
 - name: deps
   temp: {}
 - name: bin
-  temp: {}
+  host:
+    path: /tmp/bin
 - name: docker_socket
   host:
     path: /var/run/docker.sock
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 60d882a..af9846d 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -2,6 +2,6 @@
 FROM alpine:latest
 
 # Copy Binary (Currently Just a file)
-COPY /binaries/app /app
+COPY /tmp/bin/app /app
 
 CMD ["/app"]
\ No newline at end of file