diff --git a/README.md b/README.md
index 5dd11d7..d049a95 100644
--- a/README.md
+++ b/README.md
@@ -39,14 +39,24 @@ terraform {
   required_providers {
     waypoint = {
       source  = "local/hashicorp/waypoint"
-      version = "0.1.0"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
+  
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
 }
 
 resource "waypoint_project" "example" {
@@ -76,6 +86,8 @@ resource "waypoint_project" "example" {
   }
 }
 ```
+NOTE: `WAYPOINT_HOST` and `WAYPOINT_TOKEN` may be set as environment variables, and will override the provider host/token set in your terraform configuration.
+
 
 ## Developing the Provider
 
diff --git a/docs/data-sources/runner_profile.md b/docs/data-sources/runner_profile.md
index 6160dc6..f098db9 100644
--- a/docs/data-sources/runner_profile.md
+++ b/docs/data-sources/runner_profile.md
@@ -13,20 +13,6 @@ description: |-
 ## Example Usage
 
 ```terraform
-terraform {
-  required_providers {
-    waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
-    }
-  }
-}
-
-provider "waypoint" {
-  host  = "localhost:9701"
-  token = ""
-}
-
 data "waypoint_runner_profile" "default_docker" {
   id = "01GV45AW59XGNT906S8XXKG5E5"
 }
diff --git a/docs/index.md b/docs/index.md
index 9f7d9e1..c992933 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -16,15 +16,25 @@ description: |-
 terraform {
   required_providers {
     waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
+      source = "hashicorp/waypoint"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
+
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
 }
 ```
 
diff --git a/docs/resources/config_source.md b/docs/resources/config_source.md
index 9de38aa..ff9f8aa 100644
--- a/docs/resources/config_source.md
+++ b/docs/resources/config_source.md
@@ -13,6 +13,7 @@ description: |-
 ## Example Usage
 
 ```terraform
+## Example #1: global scoped
 resource "waypoint_config_source" "globalvault" {
   type  = "globalvault"
   scope = "global"
@@ -23,6 +24,7 @@ resource "waypoint_config_source" "globalvault" {
   }
 }
 
+## Example #2: project scoped
 resource "waypoint_config_source" "projectvault" {
   type        = "vault"
   scope       = "project"
diff --git a/docs/resources/project.md b/docs/resources/project.md
index d449c40..7ce3939 100644
--- a/docs/resources/project.md
+++ b/docs/resources/project.md
@@ -14,34 +14,51 @@ description: |-
 
 ```terraform
 resource "waypoint_project" "example" {
-
   project_name           = "example"
-  remote_runners_enabled = false
+  remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
     file_change_signal        = "some-signal"
     git_poll_interval_seconds = 15
+    # ignore_changes_outside_path = true
   }
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
+  project_variables = [
+    {
+      name      = "name"
+      value     = "devopsrob"
+      sensitive = true
+    },
+    {
+      name      = "job"
+      value     = "dev-advocate"
+      sensitive = false
+    },
+    {
+      name      = "conference"
+      value     = "HashiConf EU 2022"
+      sensitive = false
+    },
+  ]
+
+  git_auth_basic = {
+    username = "catsby"
+    password = "test"
   }
 }
 
 ##Git auth ssh example
-resource "waypoint_project" "example" {
+resource "waypoint_project" "example1" {
 
-  project_name           = "example"
+  project_name           = "example1"
   remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
@@ -51,16 +68,17 @@ resource "waypoint_project" "example" {
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
-  }
-
-
-  git_auth_ssh {
-    git_user        = "devops-rob"
-    passphrase      = "test-password"
+  project_variables = [
+    {
+      name      = "devopsrob"
+      value     = "dev-advocate"
+      sensitive = "false"
+    },
+  ]
+
+  git_auth_ssh = {
+    git_user        = "cassie"
+    passphrase      = "test"
     ssh_private_key = <<EOF
 -----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCjcGqTkOq0CR3rTx0ZSQSIdTrDrFAYl29611xN8aVgMQIWtDB/
@@ -98,6 +116,10 @@ EOF
 - `project_variables` (Attributes List) List of variables in Key/value pairs associated with the Waypoint Project (see [below for nested schema](#nestedatt--project_variables))
 - `remote_runners_enabled` (Boolean) Enable remote runners for project
 
+### Read-Only
+
+- `id` (String) The id required for acceptance testing to work
+
 <a id="nestedatt--data_source_git"></a>
 ### Nested Schema for `data_source_git`
 
diff --git a/examples/data-sources/waypoint_runner_profile/data-source.tf b/examples/data-sources/waypoint_runner_profile/data-source.tf
index bbe5caa..98ab4ca 100644
--- a/examples/data-sources/waypoint_runner_profile/data-source.tf
+++ b/examples/data-sources/waypoint_runner_profile/data-source.tf
@@ -1,17 +1,3 @@
-terraform {
-  required_providers {
-    waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
-    }
-  }
-}
-
-provider "waypoint" {
-  host  = "localhost:9701"
-  token = ""
-}
-
 data "waypoint_runner_profile" "default_docker" {
   id = "01GV45AW59XGNT906S8XXKG5E5"
 }
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
index 1b404e6..16134eb 100644
--- a/examples/provider/provider.tf
+++ b/examples/provider/provider.tf
@@ -1,14 +1,23 @@
 terraform {
   required_providers {
     waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
+      source = "hashicorp/waypoint"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
-}
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
 
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
+}
\ No newline at end of file
diff --git a/examples/resources/waypoint_config_source/resource.tf b/examples/resources/waypoint_config_source/resource.tf
index 74840e2..be1e7e2 100644
--- a/examples/resources/waypoint_config_source/resource.tf
+++ b/examples/resources/waypoint_config_source/resource.tf
@@ -1,3 +1,4 @@
+## Example #1: global scoped
 resource "waypoint_config_source" "globalvault" {
   type  = "globalvault"
   scope = "global"
@@ -8,6 +9,7 @@ resource "waypoint_config_source" "globalvault" {
   }
 }
 
+## Example #2: project scoped
 resource "waypoint_config_source" "projectvault" {
   type        = "vault"
   scope       = "project"
diff --git a/examples/resources/waypoint_project/provider.tf b/examples/resources/waypoint_project/provider.tf
deleted file mode 100644
index 988eaf9..0000000
--- a/examples/resources/waypoint_project/provider.tf
+++ /dev/null
@@ -1,53 +0,0 @@
-terraform {
-  required_providers {
-    waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
-    }
-  }
-}
-
-provider "waypoint" {
-  host  = "localhost:9701"
-  token = ""
-}
-
-resource "waypoint_project" "example" {
-
-  project_name           = "example"
-  remote_runners_enabled = true
-
-  data_source_git = {
-    git_url                   = "https://github.com/hashicorp/waypoint-examples"
-    git_path                  = "docker/go"
-    git_ref                   = "HEAD"
-    file_change_signal        = "some-signal"
-    git_poll_interval_seconds = 15
-    # ignore_changes_outside_path = true
-  }
-
-  app_status_poll_seconds = 12
-
-  project_variables = [
-    {
-      name      = "name"
-      value     = "devopsrob"
-      sensitive = true
-    },
-    {
-      name      = "job"
-      value     = "dev-advocate"
-      sensitive = false
-    },
-    {
-      name      = "conference"
-      value     = "HashiConf EU 2022"
-      sensitive = false
-    },
-  ]
-
-  git_auth_basic = {
-    username = "catsby"
-    password = "test"
-  }
-}
diff --git a/examples/resources/waypoint_project/resource.tf b/examples/resources/waypoint_project/resource.tf
index 538cf24..8a5e1be 100644
--- a/examples/resources/waypoint_project/resource.tf
+++ b/examples/resources/waypoint_project/resource.tf
@@ -1,32 +1,49 @@
 resource "waypoint_project" "example" {
-
   project_name           = "example"
-  remote_runners_enabled = false
+  remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
     file_change_signal        = "some-signal"
     git_poll_interval_seconds = 15
+    # ignore_changes_outside_path = true
   }
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
+  project_variables = [
+    {
+      name      = "name"
+      value     = "devopsrob"
+      sensitive = true
+    },
+    {
+      name      = "job"
+      value     = "dev-advocate"
+      sensitive = false
+    },
+    {
+      name      = "conference"
+      value     = "HashiConf EU 2022"
+      sensitive = false
+    },
+  ]
+
+  git_auth_basic = {
+    username = "catsby"
+    password = "test"
   }
 }
 
 ##Git auth ssh example
-resource "waypoint_project" "example" {
+resource "waypoint_project" "example1" {
 
-  project_name           = "example"
+  project_name           = "example1"
   remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
@@ -36,16 +53,17 @@ resource "waypoint_project" "example" {
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
-  }
-
+  project_variables = [
+    {
+      name      = "devopsrob"
+      value     = "dev-advocate"
+      sensitive = "false"
+    },
+  ]
 
-  git_auth_ssh {
-    git_user        = "devops-rob"
-    passphrase      = "test-password"
+  git_auth_ssh = {
+    git_user        = "cassie"
+    passphrase      = "test"
     ssh_private_key = <<EOF
 -----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCjcGqTkOq0CR3rTx0ZSQSIdTrDrFAYl29611xN8aVgMQIWtDB/
diff --git a/internal/provider/config_source_resource_test.go b/internal/provider/config_source_resource_test.go
index 52112dc..a623283 100644
--- a/internal/provider/config_source_resource_test.go
+++ b/internal/provider/config_source_resource_test.go
@@ -13,24 +13,19 @@ func TestAccConfigSource(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create and Read testing
 			{
-				Config: providerConfig + testAccExampleResourceConfig,
+				Config: helperTestAccTFExampleConfig(t, "resources/waypoint_config_source/resource.tf"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("waypoint_config_source.vaultbasic", "type", "vault"),
-					resource.TestCheckResourceAttr("waypoint_config_source.vaultbasic", "scope", "global"),
+					// Example #1: global scoped
+					resource.TestCheckResourceAttr("waypoint_config_source.globalvault", "type", "globalvault"),
+					resource.TestCheckResourceAttr("waypoint_config_source.globalvault", "scope", "global"),
+
+					// Example #2: project scoped
+					resource.TestCheckResourceAttr("waypoint_config_source.projectvault", "type", "vault"),
+					resource.TestCheckResourceAttr("waypoint_config_source.projectvault", "scope", "project"),
 				),
+				ExpectError: nil,
+				PlanOnly:    false,
 			},
 		},
 	})
 }
-
-var testAccExampleResourceConfig = `
-resource "waypoint_config_source" "vaultbasic" {
-  type  = "vault"
-  scope = "global"
-  config = {
-    addr           = "https://localhost:8200"
-    skip_verify    = true
-    aws_access_key = "testing"
-  }
-}
-`
diff --git a/internal/provider/project_resource.go b/internal/provider/project_resource.go
index efd8fac..3d96972 100644
--- a/internal/provider/project_resource.go
+++ b/internal/provider/project_resource.go
@@ -39,6 +39,7 @@ type projectResource struct {
 
 // projectResourceModel maps the resource schema data.
 type projectResourceModel struct {
+	ID                   types.String      `tfsdk:"id"`
 	Name                 types.String      `tfsdk:"project_name"`
 	Variables            []*variablesModel `tfsdk:"project_variables"`
 	RemoteRunnersEnabled types.Bool        `tfsdk:"remote_runners_enabled"`
@@ -92,6 +93,10 @@ func (r *projectResource) Configure(_ context.Context, req resource.ConfigureReq
 func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Attributes: map[string]schema.Attribute{
+			"id": schema.StringAttribute{
+				Computed:    true,
+				Description: "The id required for acceptance testing to work",
+			},
 			"project_name": schema.StringAttribute{
 				Required:    true,
 				Description: "The name of the Waypoint project",
@@ -258,6 +263,8 @@ func (r *projectResource) Read(ctx context.Context, req resource.ReadRequest, re
 		return
 	}
 
+	//re-add the ID here so response has it
+	state.ID = types.StringValue(project.Name) //name is the best we can do for now
 	state.RemoteRunnersEnabled = types.BoolValue(project.RemoteEnabled)
 
 	var projectVariables []*variablesModel
@@ -446,6 +453,7 @@ func (r *projectResource) upsert(ctx context.Context, plan projectResourceModel)
 	projectConf.GitPollInterval = time.Duration(plan.DataSourceGit.PollInterval.ValueInt64()) * time.Second
 
 	projectConf.FileChangeSignal = plan.DataSourceGit.FileChangeSignal.ValueString()
-	_, err := r.client.UpsertProject(ctx, projectConf, &gitConfig, variableList)
+	proj, err := r.client.UpsertProject(ctx, projectConf, &gitConfig, variableList)
+	plan.ID = types.StringValue(proj.Name)
 	return plan, err
 }
diff --git a/internal/provider/project_resource_test.go b/internal/provider/project_resource_test.go
new file mode 100644
index 0000000..f116fa0
--- /dev/null
+++ b/internal/provider/project_resource_test.go
@@ -0,0 +1,59 @@
+package provider
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+)
+
+func TestAccProjectResource(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: helperTestAccTFExampleConfig(t, "resources/waypoint_project/resource.tf"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_name", "example"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "remote_runners_enabled", "true"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "data_source_git.git_url", "https://github.com/hashicorp/waypoint-examples"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "data_source_git.git_path", "docker/go"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "data_source_git.git_ref", "HEAD"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "data_source_git.file_change_signal", "some-signal"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "data_source_git.git_poll_interval_seconds", "15"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "app_status_poll_seconds", "12"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.0.name", "name"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.0.value", "devopsrob"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.0.sensitive", "true"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.1.name", "job"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.1.value", "dev-advocate"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.1.sensitive", "false"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.2.name", "conference"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.2.value", "HashiConf EU 2022"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "project_variables.2.sensitive", "false"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "git_auth_basic.%", "2"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "git_auth_basic.username", "catsby"),
+					resource.TestCheckResourceAttr("waypoint_project.example", "git_auth_basic.password", "test"),
+
+					// Example1 from examples directory
+					resource.TestCheckResourceAttr("waypoint_project.example1", "project_name", "example1"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "remote_runners_enabled", "true"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "data_source_git.git_url", "https://github.com/hashicorp/waypoint-examples"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "data_source_git.git_path", "docker/go"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "data_source_git.git_ref", "HEAD"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "data_source_git.file_change_signal", "some-signal"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "data_source_git.git_poll_interval_seconds", "15"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "app_status_poll_seconds", "12"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "project_variables.0.name", "devopsrob"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "project_variables.0.value", "dev-advocate"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "project_variables.0.sensitive", "false"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "git_auth_ssh.%", "3"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "git_auth_ssh.git_user", "cassie"),
+					resource.TestCheckResourceAttr("waypoint_project.example1", "git_auth_ssh.passphrase", "test"),
+				),
+				ExpectError: nil,
+				PlanOnly:    false,
+			},
+		},
+	})
+}
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index d1faea5..41d48f6 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -103,11 +103,11 @@ func (p *waypointProvider) Configure(ctx context.Context, req provider.Configure
 	host := os.Getenv("WAYPOINT_HOST")
 	token := os.Getenv("WAYPOINT_TOKEN")
 
-	if !config.Host.IsNull() {
+	if host == "" {
 		host = config.Host.ValueString()
 	}
 
-	if !config.Token.IsNull() {
+	if token == "" {
 		token = config.Token.ValueString()
 	}
 
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
index 31e281f..754965e 100644
--- a/internal/provider/provider_test.go
+++ b/internal/provider/provider_test.go
@@ -7,17 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 )
 
-const (
-	// providerConfig is a shared configuration to combine with the actual
-	// test configuration so the client is properly configured.
-	// It is also possible to use environment variables instead,
-	// such as updating the Makefile and running the testing through that tool.
-	providerConfig = `
-provider "waypoint" {}
-
-`
-)
-
 var (
 	// testAccProtoV6ProviderFactories are used to instantiate a provider during
 	// acceptance testing. The factory function will be invoked for every Terraform
diff --git a/internal/provider/test_helper.go b/internal/provider/test_helper.go
new file mode 100644
index 0000000..d31e2c2
--- /dev/null
+++ b/internal/provider/test_helper.go
@@ -0,0 +1,20 @@
+package provider
+
+import (
+	"os"
+	"testing"
+)
+
+// helperTestAccTFExampleConfig is intended for us to more easily pass in just the
+// corresponding resource folder and file
+// Example: helperTestAccTFExampleConfig("resources/waypoint_project/project.tf")
+// Example: helperTestAccTFExampleConfig("data-sources/waypoint_project/project.tf")
+func helperTestAccTFExampleConfig(t *testing.T, filename string) string {
+	t.Helper()
+	fileContent, err := os.ReadFile("../../examples/" + filename)
+	if err != nil {
+		t.Fatalf("err reading file: %s, %s", filename, err)
+	}
+
+	return string(fileContent)
+}