diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..c56b4fd
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,35 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v3
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v22
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          install_url: https://releases.nixos.org/nix/nix-2.16/install
+          extra_nix_config: |
+            extra-trusted-public-keys = "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+            extra-substituters = "https://cache.iog.io"
+            experimental-features = nix-command flakes
+
+      - name: Build Nix Shell
+        run: |
+          nix build .#devShells.x86_64-linux.default
+
+      - name: Build Marlowe Vesting (with Nix)
+        run: |
+          nix build .#marlowe-vesting
+
+      - name: Build Marlowe Vesting (inside nix develop)
+        run: |
+          nix develop --command bash -c 'npm install && npm run build'
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index c77b794..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: "Deploy"
-env:
-  CACHE_NAME: marlowe-temp
-  ALLOWED_URIS: "https://github.com https://api.github.com"
-  TRUSTED_PUBLIC_KEYS: "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= marlowe-temp.cachix.org-1:1gPjVFpu4QjaAT3tRurCioX+BC23V7mjvFwpP5bV0Ec= loony-tools:pr9m4BkM/5/eSTZlkQyRt57Jz7OMBxNSUiMC4FkcNfk="
-  SUBSTITUTERS: "https://cache.nixos.org/ https://cache.iog.io https://marlowe-temp.cachix.org https://cache.zw3rk.com/"
-  VAULT_ADDR: "https://vault.dapps.aws.iohkdev.io"
-  NOMAD_ADDR: "https://nomad.dapps.aws.iohkdev.io"
-  NOMAD_NAMESPACE: "marlowe"
-on:
-  push:
-    branches:
-      - main
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: cachix/install-nix-action@v21
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          install_url: https://releases.nixos.org/nix/nix-2.10.3/install
-          extra_nix_config: |
-            allowed-uris = ${{ env.ALLOWED_URIS }}
-            trusted-public-keys = ${{ env.TRUSTED_PUBLIC_KEYS }}
-            substituters = ${{ env.SUBSTITUTERS }}
-            experimental-features = nix-command flakes
-      - name: Build images and copy to local Docker registry
-        run: |
-          nix build .#oci-images.x86_64-linux.all.copyToDockerDaemon
-          ./result/bin/copy-to-docker-daemon
-      - name: Authenticate with container registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-      - name: Tag and push images
-        run: |
-          tagAndPush() {
-            IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$2
-            # Change all uppercase to lowercase
-            IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-            echo IMAGE_ID=$IMAGE_ID
-            docker tag $2:latest $IMAGE_ID:$TAG
-            docker push $IMAGE_ID:$TAG
-          }
-          if [[ "${{ github.ref }}" == "refs/heads/main" ]]
-            export TAG=latest
-            echo TAG=$TAG
-            tagAndPush "marlowe-vesting"
-          fi