diff --git a/.github/workflows/integration-self-hosted.yml b/.github/workflows/integration-self-hosted.yml
index d85ac0cc..5b13485a 100644
--- a/.github/workflows/integration-self-hosted.yml
+++ b/.github/workflows/integration-self-hosted.yml
@@ -20,19 +20,19 @@ jobs:
 
       - name: Terraform Init
         run: |
-          docker exec provider sh -c "cd self_hosted && terraform init"
+          docker exec --workdir /usr/src/app/integration/self_hosted provider terraform init
 
       - name: Terraform Apply
         run: |
-          docker exec provider sh -c "cd self_hosted && terraform apply -auto-approve -compact-warnings"
+          docker exec --workdir /usr/src/app/integration/self_hosted provider terraform apply -auto-approve -compact-warnings
 
       - name: Terraform Plan
         run: |
-          docker exec provider sh -c "cd self_hosted && terraform plan -detailed-exitcode"
+          docker exec --workdir /usr/src/app/integration/self_hosted provider terraform plan -detailed-exitcode
 
       - name: Terraform Destroy
         run: |
-          docker exec provider sh -c "cd self_hosted && terraform destroy -auto-approve -compact-warnings"
+          docker exec --workdir /usr/src/app/integration/self_hosted provider terraform destroy -auto-approve -compact-warnings
 
       - name: Docker Compose Down
         run: docker compose down
diff --git a/docs/index.md b/docs/index.md
index 1b667a8d..aa576e9e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -21,8 +21,8 @@ provider "materialize" {
 # Self-hosted Materialize authentication
 provider "materialize" {
   host     = "materialized" # optionally use MZ_HOST env var
-  port     = 6877           # optionally use MZ_PORT env var
-  username = "mz_system"    # optionally use MZ_USER env var
+  port     = 6875           # optionally use MZ_PORT env var
+  username = "materialize"  # optionally use MZ_USER env var
   database = "materialize"  # optionally use MZ_DATABASE env var
   password = ""             # optionally use MZ_PASSWORD env var
   sslmode  = "disable"      # optionally use MZ_SSLMODE env var
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
index 76d960cf..0225f50f 100644
--- a/examples/provider/provider.tf
+++ b/examples/provider/provider.tf
@@ -7,8 +7,8 @@ provider "materialize" {
 # Self-hosted Materialize authentication
 provider "materialize" {
   host     = "materialized" # optionally use MZ_HOST env var
-  port     = 6877           # optionally use MZ_PORT env var
-  username = "mz_system"    # optionally use MZ_USER env var
+  port     = 6875           # optionally use MZ_PORT env var
+  username = "materialize"  # optionally use MZ_USER env var
   database = "materialize"  # optionally use MZ_DATABASE env var
   password = ""             # optionally use MZ_PASSWORD env var
   sslmode  = "disable"      # optionally use MZ_SSLMODE env var
diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
index 8b82faeb..ce9eb5ac 100644
--- a/pkg/provider/provider.go
+++ b/pkg/provider/provider.go
@@ -73,13 +73,13 @@ func Provider(version string) *schema.Provider {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Description: "The Materialize SQL port. Can also come from the `MZ_PORT` environment variable.",
-				DefaultFunc: schema.EnvDefaultFunc("MZ_PORT", 6877),
+				DefaultFunc: schema.EnvDefaultFunc("MZ_PORT", 6875),
 			},
 			"username": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "The Materialize username. Can also come from the `MZ_USERNAME` environment variable.",
-				DefaultFunc: schema.EnvDefaultFunc("MZ_USERNAME", "mz_system"),
+				DefaultFunc: schema.EnvDefaultFunc("MZ_USERNAME", "materialize"),
 			},
 		},
 		ResourcesMap: map[string]*schema.Resource{