diff --git a/.dockerignore b/.dockerignore
index 0d0d4f0c6..3765648b1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 *
 !dist
+!build
diff --git a/codefresh.yml b/codefresh.yml
new file mode 100644
index 000000000..25413098b
--- /dev/null
+++ b/codefresh.yml
@@ -0,0 +1,36 @@
+version: '1.0'
+steps:
+
+  build_backend:
+    image: portainer/golang-builder:ci
+    working_directory: ${{main_clone}}
+    commands:
+      - mkdir -p /go/src/github.com/${{CF_REPO_OWNER}}
+      - ln -s /codefresh/volume/${{CF_REPO_NAME}}/api /go/src/github.com/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}
+      - /build.sh api/cmd/portainer
+
+  build_frontend:
+    image: portainer/angular-builder:latest
+    working_directory: ${{build_backend}}
+    commands:
+      - npm install -g bower grunt grunt-cli && npm install
+      - bower install --allow-root
+      - grunt build-webapp
+      - mv api/cmd/portainer/portainer dist/
+
+  build_image:
+    type: build
+    working_directory: ${{build_frontend}}
+    dockerfile: ./build/linux/Dockerfile
+    image_name: portainer/portainer
+    tag: ${{CF_BRANCH}}
+
+  push_image:
+    type: push
+    candidate: '${{build_image}}'
+    tag: '${{CF_BRANCH}}'
+    registry: dockerhub
+    when:
+      branch:
+        only:
+          - develop