diff --git a/.github/workflows/cli-build-pipeline.yml b/.github/workflows/cli-build-pipeline.yml
index ed8af391..e0f9d8f7 100644
--- a/.github/workflows/cli-build-pipeline.yml
+++ b/.github/workflows/cli-build-pipeline.yml
@@ -117,6 +117,8 @@ jobs:
       - name: Test generated terraform on broker
         run: |
           # Create
+          sed -i '/# username       = "admin"/c\username       = "admin"' messageVpn.tf
+          sed -i '/# password       = "admin"/c\password       = "admin"' messageVpn.tf
           terraform plan
           terraform apply -auto-approve
           sleep 1
diff --git a/cmd/broker/client.go b/cmd/broker/client.go
index 38b720a3..4e01d360 100644
--- a/cmd/broker/client.go
+++ b/cmd/broker/client.go
@@ -1,3 +1,18 @@
+// terraform-provider-solacebroker
+//
+// Copyright 2023 Solace Corporation. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package broker
 
 import (
diff --git a/cmd/command/configgenerator.go b/cmd/command/configgenerator.go
index 0f858925..eacdbaf6 100644
--- a/cmd/command/configgenerator.go
+++ b/cmd/command/configgenerator.go
@@ -1,3 +1,18 @@
+// terraform-provider-solacebroker
+//
+// Copyright 2023 Solace Corporation. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package terraform
 
 import (
diff --git a/cmd/command/configwriter.go b/cmd/command/configwriter.go
index aef7b715..4be79122 100644
--- a/cmd/command/configwriter.go
+++ b/cmd/command/configwriter.go
@@ -1,3 +1,18 @@
+// terraform-provider-solacebroker
+//
+// Copyright 2023 Solace Corporation. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package terraform
 
 import (
diff --git a/cmd/command/templates/terraform.template b/cmd/command/templates/terraform.template
index dc5bf6bf..293fa847 100644
--- a/cmd/command/templates/terraform.template
+++ b/cmd/command/templates/terraform.template
@@ -8,8 +8,8 @@ terraform {
 }
 
 provider solacebroker {
-  username       = "admin"                 # This is a placeholder.
-  password       = "admin"                 # This is a placeholder.
+  # username       = "admin"                 # This is a placeholder.
+  # password       = "admin"                 # This is a placeholder.
   url            = "{{.BrokerURL}}"
 }
 
diff --git a/cmd/command/util.go b/cmd/command/util.go
index 6e744c62..1dddbecb 100644
--- a/cmd/command/util.go
+++ b/cmd/command/util.go
@@ -1,3 +1,18 @@
+// terraform-provider-solacebroker
+//
+// Copyright 2023 Solace Corporation. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package terraform
 
 import (
diff --git a/cmd/versioncmd.go b/cmd/versioncmd.go
index 9331263f..78cd6d90 100644
--- a/cmd/versioncmd.go
+++ b/cmd/versioncmd.go
@@ -1,6 +1,18 @@
-/*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-*/
+// terraform-provider-solacebroker
+//
+// Copyright 2023 Solace Corporation. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package cmd
 
 import (
@@ -15,7 +27,7 @@ import (
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Provides version information about the current binary",
-	Long: "",
+	Long:  "",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println(fmt.Sprintf("Provider version: %s, based on Semp version %s", broker.ProviderVersion, generated.SempVersion))
 	},