diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91666f2..86af3c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1] - 2021-04-30
+
+Thanks to [Anders Båtstrand](https://github.com/anderius) ([PR #8](https://github.com/betr-io/terraform-provider-mssql/pull/8), [PR #9](https://github.com/betr-io/terraform-provider-mssql/pull/9))
+
+### Changed
+
+- Upgrade go-mssqldb to support go version 1.16.
+
+### Fixed
+
+- Cannot create user because of conflicting collation. ([#6](https://github.com/betr-io/terraform-provider-mssql/issues/6))
+
 ## [0.2.0] - 2021-04-06
 
 When it is not possible to give AD role: _Directory Readers_ to the Sql Server Identity or an AD Group, use *object_id* to add external user.
@@ -30,7 +42,8 @@ Initial release.
 - Resource `mssql_login` to manipulate logins to a SQL Server.
 - Resource `mssql_user` to manipulate users in a SQL Server database.
 
-[Unreleased]: https://github.com/betr-io/terraform-provider-mssql/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/betr-io/terraform-provider-mssql/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/betr-io/terraform-provider-mssql/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/betr-io/terraform-provider-mssql/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/betr-io/terraform-provider-mssql/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/betr-io/terraform-provider-mssql/releases/tag/v0.1.0
diff --git a/Makefile b/Makefile
index 729ab9a..ba3bbde 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ HOSTNAME=betr.io
 NAMESPACE=betr
 NAME=mssql
 BINARY=terraform-provider-${NAME}
-VERSION=0.2.0
+VERSION=0.2.1
 OS_ARCH=linux_amd64
 TERRAFORM=terraform
 
diff --git a/test-fixtures/all/terraform.tfvars b/test-fixtures/all/terraform.tfvars
index e69de29..86d8826 100644
--- a/test-fixtures/all/terraform.tfvars
+++ b/test-fixtures/all/terraform.tfvars
@@ -0,0 +1,5 @@
+prefix    = "Betr"
+location  = "Norway East"
+tenant_id = "30ddf688-b59c-470c-b8e1-143ccbb6ce33"
+
+local_ip_addresses = ["193.213.8.209", "193.214.250.243"]