diff --git a/CHANGELOG.md b/CHANGELOG.md
index afecaa47..99b24586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.18.0 (July 11, 2022)
+
+IMPROVEMENTS
+* add `runtime`, `stop_signal` and `stop_timeout` properties to the docker_container resource ([#364](https://github.com/kreuzwerker/terraform-provider-docker/issues/364))
+
+BUG FIXES
+* Various fixes to `docker_registry_image` to correctly handle build files and file permissions ([#398](https://github.com/kreuzwerker/terraform-provider-docker/pull/398))
+* Fix `website-generation` Github-Action ([#399](https://github.com/kreuzwerker/terraform-provider-docker/pull/399))
+
+
 ## 2.17.0 (June 23, 2022)
 
 IMPROVEMENTS
diff --git a/README.md b/README.md
index f7b4345c..f0b1d831 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ $ make build
 
 ## Example usage
 
-Take a look at the examples in the [documentation](https://registry.terraform.io/providers/kreuzwerker/docker/2.17.0/docs) of the registry
+Take a look at the examples in the [documentation](https://registry.terraform.io/providers/kreuzwerker/docker/2.18.0/docs) of the registry
 or use the following example:
 
 
@@ -47,7 +47,7 @@ terraform {
     # since new versions are released frequently
     docker = {
       source  = "kreuzwerker/docker"
-      version = "2.17.0"
+      version = "2.18.0"
     }
   }
 }
diff --git a/docs/index.md b/docs/index.md
index d93f1a69..6794b5de 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -25,7 +25,7 @@ terraform {
   required_providers {
     docker = {
       source  = "kreuzwerker/docker"
-      version = "2.17.0"
+      version = "2.18.0"
     }
   }
 }
@@ -50,7 +50,7 @@ Terraform 0.12 and earlier:
 
 ```terraform
 provider "docker" {
-  version = "~> 2.17.0"
+  version = "~> 2.18.0"
   host    = "unix:///var/run/docker.sock"
 }
 
diff --git a/examples/provider/provider-tf12.tf b/examples/provider/provider-tf12.tf
index 87980fff..460d9da8 100644
--- a/examples/provider/provider-tf12.tf
+++ b/examples/provider/provider-tf12.tf
@@ -1,5 +1,5 @@
 provider "docker" {
-  version = "~> 2.17.0"
+  version = "~> 2.18.0"
   host    = "unix:///var/run/docker.sock"
 }
 
diff --git a/examples/provider/provider-tf13.tf b/examples/provider/provider-tf13.tf
index 92ce7e70..1b4da000 100644
--- a/examples/provider/provider-tf13.tf
+++ b/examples/provider/provider-tf13.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     docker = {
       source  = "kreuzwerker/docker"
-      version = "2.17.0"
+      version = "2.18.0"
     }
   }
 }