diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
new file mode 100644
index 00000000..bead751c
--- /dev/null
+++ b/.github/workflows/build-push-image.yml
@@ -0,0 +1,28 @@
+name: Build and Push Docker Image
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - develop
+  push:
+    branches:
+      - develop
+
+jobs:
+  build_and_push_image:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      run: echo "${{ secrets.DOCKERHUB_PW }}" | docker login -u "${{ secrets.DOCKERHUB_LOGIN }}" --password-stdin
+
+    - name: Build Docker image
+      run: make build
+
+    - name: Push Docker image
+      run: docker push pyronear/pyro-engine:latest
diff --git a/Makefile b/Makefile
index 0a041b8a..4d31d973 100644
--- a/Makefile
+++ b/Makefile
@@ -20,13 +20,14 @@ single-docs:
 	sphinx-build docs/source docs/_build -a
 
 # Build the docker
-docker:
+build:
 	docker build . -t pyronear/pyro-engine:python3.8.1-slim
+	docker build . -t pyronear/pyro-engine:latest
 
 # Run the engine wrapper
 run:
 	docker build . -t pyronear/pyro-engine:latest
-	docker-compose up -d
+	docker compose up -d
 
 # Get log from engine wrapper
 log: 
@@ -34,4 +35,4 @@ log:
 
 # Stop the engine wrapper
 stop:
-	docker-compose down
+	docker compose down