diff --git a/netlify.toml b/netlify.toml
index e5c1e55..e995ead 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,23 +2,28 @@
 publish = "public/"
 command = "gem install bundler -v '~> 2.3' && bundle && hugo --gc --minify"
 
+[context.production]
+command = "gem install bundler -v '~> 2.3' && bundle && hugo --gc --minify --baseURL $URL"
+
 [context.production.environment]
 RUBY_VERSION = "3.0.4"
 HUGO_VERSION = "0.107.0"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
-HUGO_BASE_URL = "$DEPLOY_URL"
+
+[context.production]
+command = "gem install bundler -v '~> 2.3' && bundle && hugo --buildDrafts --buildFuture --buildExpired --baseURL $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
 RUBY_VERSION = "3.0.4"
 HUGO_VERSION = "0.107.0"
 HUGO_ENV = "development"
-HUGO_BASE_URL = "$DEPLOY_PRIME_URL"
+
+[context.deploy-preview]
+command = "gem install bundler -v '~> 2.3' && bundle && hugo --buildDrafts --buildFuture --buildExpired --baseURL $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
 RUBY_VERSION = "3.0.4"
 HUGO_ENV = "development"
 HUGO_VERSION = "0.107.0"
 
-[context.deploy-preview]
-command = "hugo --buildDrafts --buildFuture --buildExpired --baseURL $DEPLOY_PRIME_URL"