diff --git a/provider.go b/provider.go
index 7674a19..f7caf0b 100644
--- a/provider.go
+++ b/provider.go
@@ -65,12 +65,9 @@ func (p *bitbucketTokenProvider) Configure(ctx context.Context, req provider.Con
 		return
 	}
 
-	serverURL := config.ServerURL.ValueString()
-	authHeader := config.AuthHeader.ValueString()
-
-	providerData := ProviderData{
-		AuthHeader: authHeader,
-		ServerURL:  serverURL,
+	providerData := &ProviderData{
+		AuthHeader: config.AuthHeader.ValueString(),
+		ServerURL:  config.ServerURL.ValueString(),
 	}
 
 	resp.DataSourceData = providerData
diff --git a/resource_token.go b/resource_token.go
index e4f219c..ca5f369 100644
--- a/resource_token.go
+++ b/resource_token.go
@@ -70,14 +70,10 @@ func (r *BitbucketTokenResource) Schema(_ context.Context, req resource.SchemaRe
 
 func (r *BitbucketTokenResource) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
 	if req.ProviderData == nil {
-		resp.Diagnostics.AddError(
-			"Missing provider configuration",
-			"The Bitbucket provider was not configured before using this resource.",
-		)
 		return
 	}
 
-	providerData, ok := req.ProviderData.(ProviderData)
+	providerData, ok := req.ProviderData.(*ProviderData)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Provider Data Type",