diff --git a/internal/config/config.go b/internal/config/config.go
index bf484f3..ee86984 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -6,19 +6,21 @@ import (
 
 // Config holds the application configuration
 type Config struct {
-	ServerAddress  string `env:"MCP_REGISTRY_SERVER_ADDRESS" envDefault:":8080"`
-	DatabaseURL    string `env:"MCP_REGISTRY_DATABASE_URL" envDefault:"mongodb://localhost:27017"`
-	DatabaseName   string `env:"MCP_REGISTRY_DATABASE_NAME" envDefault:"mcp-registry"`
-	CollectionName string `env:"MCP_REGISTRY_COLLECTION_NAME" envDefault:"servers_v2"`
-	LogLevel       string `env:"MCP_REGISTRY_LOG_LEVEL" envDefault:"info"`
-	Environment    string `env:"MCP_REGISTRY_ENVIRONMENT" envDefault:"production"`
-	Version        string `env:"MCP_REGISTRY_VERSION" envDefault:"dev"`
+	ServerAddress  string `env:"SERVER_ADDRESS" envDefault:":8080"`
+	DatabaseURL    string `env:"DATABASE_URL" envDefault:"mongodb://localhost:27017"`
+	DatabaseName   string `env:"DATABASE_NAME" envDefault:"mcp-registry"`
+	CollectionName string `env:"COLLECTION_NAME" envDefault:"servers_v2"`
+	LogLevel       string `env:"LOG_LEVEL" envDefault:"info"`
+	Environment    string `env:"ENVIRONMENT" envDefault:"production"`
+	Version        string `env:"VERSION" envDefault:"dev"`
 }
 
 // NewConfig creates a new configuration with default values
 func NewConfig() *Config {
 	var cfg Config
-	err := env.Parse(&cfg)
+	err := env.ParseWithOptions(&cfg, env.Options{
+		Prefix: "MCP_REGISTRY_",
+	})
 	if err != nil {
 		panic(err)
 	}