diff --git a/.drone.yml b/.drone.yml
index a1b4c5c..9c40e7c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,40 +1,27 @@
----
 kind: pipeline
 type: docker
 name: default
 
 steps:
-- name: publish-latest
-  image: plugins/ecr
-  when:
-    branch:
-      - main
+- name: build-on-push
+  image: plugins/docker
   settings:
-    secrets: [ AWS_ACCESS_KEY_ID, AWS_ACCESS_KEY_SECRET ]
-    repo: $ECR_URL/home_api
-    registry: $ECR_URL
-  environment:
-    AWS_ACCESS_KEY_ID:
-      from_secret: AWS_ACCESS_KEY_ID
-    AWS_ACCESS_KEY_SECRET:
-      from_secret: AWS_ACCESS_KEY_SECRET
-    ECR_URL:
-      from_secret: ECR_URL
-- name: publish-tag
-  image: plugins/ecr
+    repo: registry.connermccall.me/personal_api
+    registry: registry.connermccall.me
+    tags: 
+      - ${DRONE_COMMIT_SHA:0:7}
+      - latest
   when:
     event:
-      - tag
+      - push
+- name: build
+  image: plugins/docker
   settings:
-    access_key:
-      from_secret: AWS_ACCESS_KEY_ID
-    secret_key:
-      from_secret: AWS_ACCESS_KEY_SECRET
-    repo: home_api
-    registry: $ECR_URL
+    auto_tag: true
+    repo: registry.connermccall.me/personal_api
+    registry: registry.connermccall.me
     tags:
-      - latest
-      - $DRONE_TAG
-  environment:
-    ECR_URL:
-      from_secret: ECR_URL
+      - ${DRONE_TAG}
+  when:
+    event: 
+      - tag