diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index b2797844c..c76a22872 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -256,13 +256,13 @@ run go tests race:
   image: golang:$GOVERSION
   extends: .go-cache
   variables:
-    SQLDB_DB: run_go_tests_race
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests_race
     POSTGRES_DB: run_go_tests_race
-    SQLDB_USER: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
     POSTGRES_USER: postgres
-    SQLDB_PASSWORD: $POSTGRES_PASSWORD
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
     POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-    SQLDB_HOST: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
   services:
     - postgres:14.7
   rules:
@@ -287,13 +287,13 @@ run go tests:
   image: golang:$GOVERSION
   extends: .go-cache
   variables:
-    SQLDB_DB: run_go_tests
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests
     POSTGRES_DB: run_go_tests
-    SQLDB_USER: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
     POSTGRES_USER: postgres
-    SQLDB_PASSWORD: $POSTGRES_PASSWORD
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
     POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-    SQLDB_HOST: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
   services:
     - postgres:14.7
   rules:
@@ -319,13 +319,13 @@ run go tests dax/test/dax:
   tags:
     - docker
   variables:
-    SQLDB_DB: run_go_tests_dax
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests_dax
     POSTGRES_DB: run_go_tests_dax
-    SQLDB_USER: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
     POSTGRES_USER: postgres
-    SQLDB_PASSWORD: $POSTGRES_PASSWORD
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
     POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-    SQLDB_HOST: postgres
+    FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
   services:
     - postgres:14.7
   rules:
diff --git a/dax/controller/sqldb/test.go b/dax/controller/sqldb/test.go
index cf1a78eb7..582a36c1b 100644
--- a/dax/controller/sqldb/test.go
+++ b/dax/controller/sqldb/test.go
@@ -20,11 +20,11 @@ func EnvOr(envName, defaultVal string) string {
 func GetTestConfig() *controller.SQLDBConfig {
 	return &controller.SQLDBConfig{
 		Dialect:  "postgres",
-		Database: EnvOr("SQLDB_DB", "dax_test"),
-		Host:     EnvOr("SQLDB_HOST", "127.0.0.1"),
-		Port:     EnvOr("SQLDB_PORT", "5432"),
-		User:     EnvOr("SQLDB_USER", "postgres"),
-		Password: EnvOr("SQLDB_PASSWORD", "testpass"),
+		Database: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE", "dax_test"),
+		Host:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST", "127.0.0.1"),
+		Port:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PORT", "5432"),
+		User:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER", "postgres"),
+		Password: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD", "testpass"),
 	}
 }
 
@@ -33,9 +33,9 @@ func GetTestConfigRandomDB(dbprefix string) *controller.SQLDBConfig {
 	return &controller.SQLDBConfig{
 		Dialect:  "postgres",
 		Database: fmt.Sprintf("%s_%d", dbprefix, rnd.Int()),
-		Host:     EnvOr("SQLDB_HOST", "127.0.0.1"),
-		Port:     EnvOr("SQLDB_PORT", "5432"),
-		User:     EnvOr("SQLDB_USER", "postgres"),
-		Password: EnvOr("SQLDB_PASSWORD", "testpass"),
+		Host:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST", "127.0.0.1"),
+		Port:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PORT", "5432"),
+		User:     EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER", "postgres"),
+		Password: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD", "testpass"),
 	}
 }
diff --git a/idk/docker-compose.yml b/idk/docker-compose.yml
index 388fb3519..45035a54b 100644
--- a/idk/docker-compose.yml
+++ b/idk/docker-compose.yml
@@ -147,10 +147,6 @@ services:
       FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: "postgres"
       FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: "password"
       FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: "postgres"
-      SQLDB_DB: "postgres"
-      SQLDB_USER: "postgres"
-      SQLDB_PASSWORD: "password"
-      SQLDB_HOST: "postgres"
       FEATUREBASE_COMPUTER_RUN: "true"
       FEATUREBASE_COMPUTER_CONFIG_DATA_DIR: /dax-data/computer
       FEATUREBASE_COMPUTER_CONFIG_WRITELOGGER_DIR: /dax-data/wl