diff --git a/.air.toml b/.air.toml
index c94e5f9a..67c17187 100644
--- a/.air.toml
+++ b/.air.toml
@@ -3,7 +3,7 @@ testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-  args_bin = []
+  args_bin = ["-prod"]
   bin = "./tmp/nidus-sync"
   cmd = "go build -o ./tmp/nidus-sync ."
   delay = 1000
diff --git a/html/filesystem.go b/html/filesystem.go
index eb82432c..1cd027f9 100644
--- a/html/filesystem.go
+++ b/html/filesystem.go
@@ -16,7 +16,7 @@ import (
 	//"strings"
 	//"time"
 
-	//"github.com/Gleipnir-Technology/nidus-sync/config"
+	"github.com/Gleipnir-Technology/nidus-sync/config"
 	//"github.com/aarondl/opt/null"
 	//"github.com/google/uuid"
 	"github.com/rs/zerolog/log"
@@ -36,7 +36,7 @@ type templateSystemDisk struct {
 
 func LoadTemplates() error {
 	_, err := os.Stat("html/template")
-	if err == nil {
+	if err == nil && !config.IsProductionEnvironment() {
 		templates = templateSystemDisk{
 			sourceFS: os.DirFS("./html/template"),
 		}
diff --git a/main.go b/main.go
index 99d5ebc8..644b29a7 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"net/http"
 	"os"
@@ -38,6 +39,12 @@ func main() {
 	}
 	log.Info().Msg("Starting...")
 
+	var prod = flag.Bool("prod", false, "Force into production mode")
+	flag.Parse()
+	if prod != nil && *prod {
+		log.Warn().Msg("Forcing production mode for testing templates")
+		config.Environment = "PRODUCTION"
+	}
 	err = sentry.Init(sentry.ClientOptions{
 		Debug:            false, //!config.IsProductionEnvironment(),
 		Dsn:              config.SentryDSN,