diff --git a/.codefresh/master.yml b/.codefresh/master.yml
index 5e3ec364a..07d88c517 100644
--- a/.codefresh/master.yml
+++ b/.codefresh/master.yml
@@ -1,6 +1,8 @@
 version: '1.0'
 stages:
 - test
+- build
+- release
 steps:
   UnitTest:
     title: Run unit tests
@@ -10,3 +12,15 @@ steps:
     commands:
     - ln -s /codefresh/volume/${{CF_REPO_NAME}} ${{CF_REPO_NAME}} && cd ${{CF_REPO_NAME}}
     - make test
+  BuildDockerImage:
+    title: Build Docker image
+    stage: build
+    type: build
+    image_name: ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}
+  PushDockerImage:
+    title: Push Docker image (latest)
+    stage: release
+    type: push
+    candidate: ${{BuildDockerImage}}
+    image_name: ocistorage/${{CF_REPO_NAME}}
+    registry: dockerhub