diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 06bf452..7d20e26 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: cachix/install-nix-action@v17
         with:
           nix_path: nixpkgs=channel:nixpkgs-unstable
-      - run: nix develop -c make build
+      - run: nix develop
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v1.2
         with:
diff --git a/netlify.toml b/netlify.toml
index 8c9347a..03a2586 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,8 +1,15 @@
+[build]
+publish = "public/"
+command = "make build"
+
 [context.production.environment]
 HUGO_BASE_URL = "$DEPLOY_URL"
 
-[context.branch-deploy]
-command = "hugo --baseURL $DEPLOY_PRIME_URL"
+[context.branch-deploy.environment]
+HUGO_BASE_URL = "$DEPLOY_PRIME_URL"
 
 [context.deploy-preview]
-command = "hugo --buildDrafts --buildFuture --buildExpired --baseURL $DEPLOY_PRIME_URL"
+command = "hugo --buildDrafts --buildFuture --buildExpired"
+
+[context.deploy-preview.environment]
+HUGO_BASE_URL = "$DEPLOY_PRIME_URL"