diff --git a/README.md b/README.md
index 373206b..01aa7f2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Exasol AWS Terraform Module
 
-<img alt="terraform-aws-exasol logo" src="docs/images/terraform-aws-exasol_128x128.png" style="float:left; padding:0px 10px 10px 10px;"/>
+<img alt="terraform-aws-exasol logo" src="doc/images/terraform-aws-exasol_128x128.png" style="float:left; padding:0px 10px 10px 10px;"/>
 
 [![Build Status][travis-badge]][travis-link]
 [![GitHub Latest Release][gh-release-badge]][gh-release-link]
@@ -191,6 +191,8 @@ The following configuration variables are available.
 
 Please see [CONTRIBUTING.md](CONTRIBUTING.md) for contribution guidelines.
 
+[changelog](doc/changes/changelog.md)
+
 [travis-badge]: https://travis-ci.com/exasol/terraform-aws-exasol.svg?branch=master
 [travis-link]: https://travis-ci.com/exasol/terraform-aws-exasol
 [gh-release-badge]: https://img.shields.io/github/tag/exasol/terraform-aws-exasol.svg?label=latest
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
new file mode 100644
index 0000000..c541a03
--- /dev/null
+++ b/doc/changes/changelog.md
@@ -0,0 +1,5 @@
+# Changes
+
+* [0.1.0](changes_0.1.0.md)
+* [0.0.2](changes_0.0.2.md)
+* [0.0.1](changes_0.0.1.md)
\ No newline at end of file
diff --git a/doc/changes/changes_0.0.1.md b/doc/changes/changes_0.0.1.md
new file mode 100644
index 0000000..78799ec
--- /dev/null
+++ b/doc/changes/changes_0.0.1.md
@@ -0,0 +1,10 @@
+# terraform-aws-exasol 0.0.1, released 2019-09-09
+
+## Summary
+
+This is first release version which includes initial setup of project for
+continued improvements.
+
+* Initial working version (with limited input variables)
+* Build script (`./scripts/ci.sh`) with linting and formatting
+* Travis CI based continuous build process
\ No newline at end of file
diff --git a/CHANGES.md b/doc/changes/changes_0.0.2.md
similarity index 72%
rename from CHANGES.md
rename to doc/changes/changes_0.0.2.md
index 275c31e..ed5d5a2 100644
--- a/CHANGES.md
+++ b/doc/changes/changes_0.0.2.md
@@ -1,6 +1,6 @@
-## v0.0.2
+# terraform-aws-exasol 0.0.2, released 2020-01-21
 
-> 2020 JAN 21
+## Summary
 
 * Updates to the latest cloudformation template.
   [#2](https://github.com/exasol/terraform-aws-exasol/issues/2)
@@ -19,15 +19,4 @@
   - Updates `tflint` version to `v0.13.4`.
 
 * Adds variable for license file path in order to use with Bring Your Own (BYOL)
-  Exasol machine images.
-
-## v0.0.1
-
-> 2019 SEP 09
-
-This is first release version which includes initial setup of project for
-continued improvements.
-
-* Initial working version (with limited input variables)
-* Build script (`./scripts/ci.sh`) with linting and formatting
-* Travis CI based continuous build process
+  Exasol machine images.
\ No newline at end of file
diff --git a/doc/changes/changes_0.1.0.md b/doc/changes/changes_0.1.0.md
new file mode 100644
index 0000000..98f26f9
--- /dev/null
+++ b/doc/changes/changes_0.1.0.md
@@ -0,0 +1,5 @@
+# terraform-aws-exasol 0.0.2, released 2020-XX-XX
+
+## Bugfixes
+
+* #13: The setup assigned wrong tags to ec2 instances
\ No newline at end of file
diff --git a/docs/images/terraform-aws-exasol_128x128.png b/doc/images/terraform-aws-exasol_128x128.png
similarity index 100%
rename from docs/images/terraform-aws-exasol_128x128.png
rename to doc/images/terraform-aws-exasol_128x128.png
diff --git a/main.tf b/main.tf
index 52b3623..7c5e0e7 100644
--- a/main.tf
+++ b/main.tf
@@ -36,6 +36,8 @@ resource "aws_cloudformation_stack" "exasol_cluster" {
     CreateEC2Endpoint         = var.create_ec2_endpoint
     OpenPorts                 = var.open_ports
     License                   = var.license == null ? null : file(var.license)
+    OwnerTag                  = var.owner
+    ProjectTag                = var.project
   }
 
   tags = {