diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
new file mode 100644
index 0000000..8adc244
--- /dev/null
+++ b/.github/workflows/build-push.yml
@@ -0,0 +1,82 @@
+name: Build and push
+
+on:
+  pull_request_target:
+    branches: [ "main" ]
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  build_api:
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build app image
+      run: docker build . --tag image
+
+    - name: Log into registry
+      run: echo "${{ secrets.REGISTRYPASSWORD }}" | docker login registry.nordix.org -u ${{ secrets.REGISTRYUSERNAME }} --password-stdin
+
+    - name: Push app image
+      id: image
+      run: |
+        IMAGE_ID=registry.nordix.org/eiffel/etos-api
+        # Strip git ref prefix from version
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+        # Strip "v" prefix from tag name
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+        # Use Docker `latest` tag convention
+        [ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+        docker tag image $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION
+        echo $IMAGE_ID:$VERSION
+        echo "::set-output name=version::$VERSION"
+    - name: Update manifests
+      uses: fjogeleit/yaml-update-action@main
+      with:
+        valueFile: 'manifests/base/deployment.yaml'
+        propertyPath: 'spec.template.spec.containers[0].image'
+        value: registry.nordix.org/eiffel/etos-api:${{ steps.image.outputs.version }}
+        branch: main
+        commitChange: true
+        message: Updating API manifest image to version ${{ steps.image.outputs.version }}
+  build_sse:
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build app image
+      run: docker build . -f deploy/etos-sse/Dockerfile --tag image
+
+    - name: Log into registry
+      run: echo "${{ secrets.REGISTRYPASSWORD }}" | docker login registry.nordix.org -u ${{ secrets.REGISTRYUSERNAME }} --password-stdin
+
+    - name: Push app image
+      id: image
+      run: |
+        IMAGE_ID=registry.nordix.org/eiffel/etos-sse
+        # Strip git ref prefix from version
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+        # Strip "v" prefix from tag name
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+        # Use Docker `latest` tag convention
+        [ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+        docker tag image $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION
+        echo $IMAGE_ID:$VERSION
+        echo "::set-output name=version::$VERSION"
+    - name: Update manifests
+      uses: fjogeleit/yaml-update-action@main
+      with:
+        valueFile: 'manifests/base/sse/deployment.yaml'
+        propertyPath: 'spec.template.spec.containers[0].image'
+        value: registry.nordix.org/eiffel/etos-sse:${{ steps.image.outputs.version }}
+        branch: main
+        commitChange: true
+        message: Updating SSE manifest image to version ${{ steps.image.outputs.version }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3aa31d3..938dafb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,6 +42,10 @@ jobs:
         uses: hadolint/hadolint-action@master
         with:
           dockerfile: Dockerfile
+      - name: Run hadolint for SSE
+        uses: hadolint/hadolint-action@master
+        with:
+          dockerfile: deploy/etos-sse/Dockerfile
 
   build-docker-images:
     # The type of runner that the job will run on
@@ -57,3 +61,8 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+      - name: Build SSE image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./deploy/etos-sse/Dockerfile