diff --git a/cmd/main.go b/cmd/main.go
index 697058a04d77f298ef58d7fa95dcf6ddb0e5cd25..b1e7f7e73562241f8f978670782e88f09e539811 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -20,14 +20,14 @@ var (
 	configMapName  spec.NamespacedName
 	OutOfCluster   bool
 	noTeamsAPI bool
-	noDBAccess bool
+	noDatabaseAccess bool
 	version        string
 )
 
 func init() {
 	flag.StringVar(&KubeConfigFile, "kubeconfig", "", "Path to kubeconfig file with authorization and master location information.")
 	flag.BoolVar(&OutOfCluster, "outofcluster", false, "Whether the operator runs in- our outside of the Kubernetes cluster.")
-	flag.BoolVar(&noDBAccess, "nodatabaseaccess", false, "Disable all access to the database from the operator side.")
+	flag.BoolVar(&noDatabaseAccess, "nodatabaseaccess", false, "Disable all access to the database from the operator side.")
 	flag.BoolVar(&noTeamsAPI, "noteamsapi", false, "Disable all access to the teams API")
 	flag.Parse()
 
@@ -91,8 +91,8 @@ func main() {
 	if configMapData["namespace"] == "" { // Namespace in ConfigMap has priority over env var
 		configMapData["namespace"] = podNamespace
 	}
-	if noDBAccess {
-		configMapData["enable_db_access"] = "false"
+	if noDatabaseAccess {
+		configMapData["enable_database_access"] = "false"
 	}
 	if noTeamsAPI {
 		configMapData["enable_teams_api"] = "false"
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 96b9ff65b84e42bc7f1efc08652d52e302b9d239..77e5b63648b69f6f4b4de3260f719f06a4361e15 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -52,7 +52,7 @@ type Config struct {
 	WALES3Bucket       string `name:"wal_s3_bucket"`
 	KubeIAMRole        string `name:"kube_iam_role"`
 	DebugLogging       bool   `name:"debug_logging" default:"false"`
-	EnableDBAccess	   bool   `name:"enable_db_access" default:"true"`
+	EnableDBAccess	   bool   `name:"enable_database_access" default:"true"`
 	EnableTeamsAPI     bool   `name:"enable_teams_api" default:"true"`
 	DNSNameFormat      string `name:"dns_name_format" default:"%s.%s.%s"`
 	Workers            uint32 `name:"workers" default:"4"`