diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8747f61018..ba5c6415dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Change Log
 
+## [v0.8.18](https://github.com/input-output-hk/jormungandr/tree/v0.8.18) (2020-04-10)
+
+[Full Changelog](https://github.com/input-output-hk/jormungandr/compare/nightly...v0.8.18)
+
+**Implemented enhancements:**
+
+- Nodes Compatibility test  [\#1997](https://github.com/input-output-hk/jormungandr/issues/1997)
+- Implemented derive macro for IntercomMsg [\#2034](https://github.com/input-output-hk/jormungandr/pull/2034)
+
+**Fixed bugs:**
+
+- Node stats shows wrong value for peer\_connected\_cnt [\#1977](https://github.com/input-output-hk/jormungandr/issues/1977)
+- Node created a strange block on slot 97.060 on March 19 [\#1942](https://github.com/input-output-hk/jormungandr/issues/1942)
+- always make chain selection in process\_new\_ref [\#2052](https://github.com/input-output-hk/jormungandr/pull/2052)
+
+**Merged pull requests:**
+
+- \[Tests\] move multi node legacy tests to stable build [\#2044](https://github.com/input-output-hk/jormungandr/pull/2044)
+- \[Tests\] Duplicated nodes id scenario test [\#2043](https://github.com/input-output-hk/jormungandr/pull/2043)
+- Nightly release with version and date [\#2036](https://github.com/input-output-hk/jormungandr/pull/2036)
+- Nightly build recreate fix [\#2021](https://github.com/input-output-hk/jormungandr/pull/2021)
+- \[Tests\] Jts legacy test [\#2010](https://github.com/input-output-hk/jormungandr/pull/2010)
+
 ## [v0.8.17](https://github.com/input-output-hk/jormungandr/tree/v0.8.17) (2020-04-01)
 
 [Full Changelog](https://github.com/input-output-hk/jormungandr/compare/v0.8.16...v0.8.17)
diff --git a/Cargo.lock b/Cargo.lock
index fa5f2b6319..d7fbda7745 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1916,7 +1916,7 @@ checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
 [[package]]
 name = "jcli"
-version = "0.8.18-nightly"
+version = "0.8.18"
 dependencies = [
  "bech32",
  "bincode",
@@ -1950,7 +1950,7 @@ dependencies = [
 
 [[package]]
 name = "jormungandr"
-version = "0.8.18-nightly"
+version = "0.8.18"
 dependencies = [
  "actix-cors",
  "actix-rt",
@@ -2016,7 +2016,7 @@ dependencies = [
 
 [[package]]
 name = "jormungandr-integration-tests"
-version = "0.8.18-nightly"
+version = "0.8.18"
 dependencies = [
  "assert_cmd",
  "assert_fs",
@@ -2064,7 +2064,7 @@ dependencies = [
 
 [[package]]
 name = "jormungandr-lib"
-version = "0.8.18-nightly"
+version = "0.8.18"
 dependencies = [
  "bech32",
  "bincode",
@@ -2096,7 +2096,7 @@ dependencies = [
 
 [[package]]
 name = "jormungandr-scenario-tests"
-version = "0.8.18-nightly"
+version = "0.8.18"
 dependencies = [
  "bawawa",
  "bytes 0.4.12",
diff --git a/jcli/Cargo.toml b/jcli/Cargo.toml
index 93263e2620..c5bd50a296 100644
--- a/jcli/Cargo.toml
+++ b/jcli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jcli"
-version = "0.8.18-nightly"
+version = "0.8.18"
 authors = [ "dev@iohk.io" ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/input-output-hk/jormungandr"
diff --git a/jormungandr-integration-tests/Cargo.toml b/jormungandr-integration-tests/Cargo.toml
index 86af469320..aec5e2e283 100644
--- a/jormungandr-integration-tests/Cargo.toml
+++ b/jormungandr-integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-integration-tests"
-version = "0.8.18-nightly"
+version = "0.8.18"
 authors = [ "dev@iohk.io" ]
 edition = "2018"
 
diff --git a/jormungandr-lib/Cargo.toml b/jormungandr-lib/Cargo.toml
index de3152493e..fcd37349b3 100644
--- a/jormungandr-lib/Cargo.toml
+++ b/jormungandr-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-lib"
-version = "0.8.18-nightly"
+version = "0.8.18"
 authors = ["dev@iohk.io"]
 edition = "2018"
 
diff --git a/jormungandr-scenario-tests/Cargo.toml b/jormungandr-scenario-tests/Cargo.toml
index c844504449..0fe4faf9d1 100644
--- a/jormungandr-scenario-tests/Cargo.toml
+++ b/jormungandr-scenario-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr-scenario-tests"
-version = "0.8.18-nightly"
+version = "0.8.18"
 authors = [ "dev@iohk.io" ]
 edition = "2018"
 
diff --git a/jormungandr/Cargo.toml b/jormungandr/Cargo.toml
index 0ef68ed0b1..4dd9a545a0 100644
--- a/jormungandr/Cargo.toml
+++ b/jormungandr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr"
-version = "0.8.18-nightly"
+version = "0.8.18"
 authors = [ "dev@iohk.io" ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/input-output-hk/jormungandr"