diff --git a/.drone.yml b/.drone.yml
index 97aaf89..138a1d4 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,7 +15,7 @@ steps:
   - docker image prune -f
   - docker login gitea.bsidesolutions.net --username $REGISTRY_USER --password $REGISTRY_PASS
   - docker pull gitea.bsidesolutions.net/bside-solutions/docker-compose-v2-alpine:latest
-  - docker run -d --name compose-container gitea.bsidesolutions.net/bside-solutions/docker-compose-v2-alpine sleep inf #start container in detached mode
+  - docker run --rm -d --name compose-container gitea.bsidesolutions.net/bside-solutions/docker-compose-v2-alpine sleep inf #start container in detached mode
   - sleep 5 # give container some time to fully start
   volumes:
   - name: docker_sock
@@ -46,7 +46,7 @@ steps:
     path: /var/run/docker.sock
   commands:
   - export DRONE_SHA=${DRONE_COMMIT_SHA:0:7}
-  - docker exec compose-container docker build -f ./docker-compose.drone.yaml -t oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} .
+  - docker exec compose-container docker compose build -f ./docker-compose.drone.yaml -t oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} .
   - docker tag oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7}
 - name: push-image
   image: docker/compose:latest
@@ -80,6 +80,7 @@ steps:
   - export DRONE_SHA=${DRONE_COMMIT_SHA:0:7}
   - docker login gitea.bsidesolutions.net --username $REGISTRY_USER --password $REGISTRY_PASS
   - docker exec compose-container docker compose -f ./docker-compose.drone.yaml push
+  - docker container stop compose-container
 
 # - name: deploy-staging
 #   image: plugins/ansible:latest