diff --git a/CHANGELOG b/CHANGELOG
index af14221db4ee14e233bfb1c51c4fc00d74f51a7e..81709e25bbdf8781cf8c40c4e6977ffcbdcacb0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,57 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.18.3 (2019-03-21)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/index.html
+
+
+Avoid mixed content when deploying mono-container behind proxy [Manual action required]
+---------------------------------------------------------------------------------------
+
+*You are only concerned if you use the mono-container docker deployment behind a reverse proxy*
+
+Because of `an issue in our mono-container configuration <https://github.com/thetarkus/docker-funkwhale/issues/19>`_, users deploying Funkwhale via docker
+using our `funkwhale/all-in-one` image could face some mixed content warnings (and possibly other troubles)
+when browsing the Web UI.
+
+This is fixed in this release, but on existing deployments, you'll need to add ``NESTED_PROXY=1`` in your container
+environment (either in your ``.env`` file, or via your container management tool), then recreate your funkwhale container.
+
+
+Enhancements:
+
+- Added title on hover for truncated content (#766)
+- Ask for confirmation before leaving upload page if there is a an upload in process (#630)
+- Exclude in-place imported files from quota computation (#570)
+- Truncate filename in library file table to ensure correct display of the table. (#735)
+
+
+Bugfixes:
+
+- Avoid mixed content when deploying mono-container behind HTTPS proxy (thetarkus/docker-funkwhale#19)
+- Display new notifications immediatly on notifications page (#729)
+- Ensure cover art from uploaded files is picked up properly on existing albums (#757)
+- Fixed a crash when federating a track with unspecified position
+- Fixed broken Activity and Actor modules in django admin (#767)
+- Fixed broken sample apache configuration (#764)
+- Fixed constant and unpredictable reordering during file upload (#716)
+- Fixed delivering of local activities causing unintended side effects, such as rollbacking changes (#737)
+- Fixed escaping issues in translated strings (#652)
+- Fixed saving moderation policy when clicking on "Cancel" (#751)
+- i18n: Update page title when changing the App's language. (#511)
+- Include disc number in Subsonic responses (#765)
+- Do not send notification when rejecting a follow on a local library (#743)
+
+
+Documentation:
+
+- Added documentation on mono-container docker upgrade (#713)
+- Added documentation to set up let's encrypt certificate (#745)
+
+
 0.18.2 (2019-02-13)
 -------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 5038f371a964aa426615a377768fceec9ba78870..cfadc246cf92752e860fe2e755cfa5490f13c789 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.18.2"
+__version__ = "0.18.3"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/511.bugfix b/changes/changelog.d/511.bugfix
deleted file mode 100644
index 0c4b61375a42a914942e3243fc947a5950bcb6f3..0000000000000000000000000000000000000000
--- a/changes/changelog.d/511.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-i18n: Update page title when changing the App's language. (#511)
diff --git a/changes/changelog.d/570.enhancement b/changes/changelog.d/570.enhancement
deleted file mode 100644
index 7cddc4f3f53ea2df8af2f38636e5f5e6db511314..0000000000000000000000000000000000000000
--- a/changes/changelog.d/570.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Exclude in-place imported files from quota computation (#570)
diff --git a/changes/changelog.d/630.enhancement b/changes/changelog.d/630.enhancement
deleted file mode 100644
index 019911337ca63376568c0ea0f8a362b532a9a4a0..0000000000000000000000000000000000000000
--- a/changes/changelog.d/630.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Ask for confirmation before leaving upload page if there is a an upload in process (#630)
\ No newline at end of file
diff --git a/changes/changelog.d/652.bugfix b/changes/changelog.d/652.bugfix
deleted file mode 100644
index da8d30b001d96a9fef3bbca62bfc5ab20980181a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/652.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed escaping issues in translated strings (#652)
diff --git a/changes/changelog.d/713.doc b/changes/changelog.d/713.doc
deleted file mode 100644
index ad3db61a2d261847ede69a0a3e571b823ce3403f..0000000000000000000000000000000000000000
--- a/changes/changelog.d/713.doc
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation on mono-container docker upgrade (#713)
diff --git a/changes/changelog.d/716.bugfix b/changes/changelog.d/716.bugfix
deleted file mode 100644
index 1b9b182c93b8dc7984088624fa7ebbc8d1b6c49d..0000000000000000000000000000000000000000
--- a/changes/changelog.d/716.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed constant and unpredictable reordering during file upload (#716)
diff --git a/changes/changelog.d/729.bugfix b/changes/changelog.d/729.bugfix
deleted file mode 100644
index a0209cb959485cc512968088803b846247c2b63a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/729.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Display new notifications immediatly on notifications page (#729)
diff --git a/changes/changelog.d/735.enhancement b/changes/changelog.d/735.enhancement
deleted file mode 100644
index d6fb9ad70b36a330369759aa32ee172a19a30927..0000000000000000000000000000000000000000
--- a/changes/changelog.d/735.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Truncate filename in library file table to ensure correct display of the table. (#735)
diff --git a/changes/changelog.d/737.bugfix b/changes/changelog.d/737.bugfix
deleted file mode 100644
index c65050a6eeac3ab77accd5a128b7a2d014c30a23..0000000000000000000000000000000000000000
--- a/changes/changelog.d/737.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed delivering of local activities causing unintended side effects, such as rollbacking changes (#737)
diff --git a/changes/changelog.d/743.bugfig b/changes/changelog.d/743.bugfig
deleted file mode 100644
index 5a3ebea0cdb7e16f89ae762bfb6dc33e9b64cb9d..0000000000000000000000000000000000000000
--- a/changes/changelog.d/743.bugfig
+++ /dev/null
@@ -1 +0,0 @@
-Do not send notification when rejecting a follow on a local library (#743)
diff --git a/changes/changelog.d/745.doc b/changes/changelog.d/745.doc
deleted file mode 100644
index 1bdb784f32510fa080161f3bef00577301b23838..0000000000000000000000000000000000000000
--- a/changes/changelog.d/745.doc
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation to set up let's encrypt certificate (#745)
diff --git a/changes/changelog.d/751.bugfix b/changes/changelog.d/751.bugfix
deleted file mode 100644
index f107e2c78293721b2e7b26d18000a727a78339d2..0000000000000000000000000000000000000000
--- a/changes/changelog.d/751.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed saving moderation policy when clicking on "Cancel" (#751)
diff --git a/changes/changelog.d/757.bugfix b/changes/changelog.d/757.bugfix
deleted file mode 100644
index f9e9eae351a63297a17b790e957ad7dabba292bf..0000000000000000000000000000000000000000
--- a/changes/changelog.d/757.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure cover art from uploaded files is picked up properly on existing albums (#757)
diff --git a/changes/changelog.d/764.bugfix b/changes/changelog.d/764.bugfix
deleted file mode 100644
index 114f602b5744cf750341a5d9c995173de638854b..0000000000000000000000000000000000000000
--- a/changes/changelog.d/764.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken sample apache configuration (#764)
diff --git a/changes/changelog.d/765.bugfix b/changes/changelog.d/765.bugfix
deleted file mode 100644
index 79872e1ed5bd06c9d95398e37032b9abd2ba00da..0000000000000000000000000000000000000000
--- a/changes/changelog.d/765.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Include disc number in Subsonic responses (#765)
diff --git a/changes/changelog.d/766.enhancement b/changes/changelog.d/766.enhancement
deleted file mode 100644
index 7aca9fb1c041d8119f52db134b24ecc306920945..0000000000000000000000000000000000000000
--- a/changes/changelog.d/766.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added title on hover for truncated content (#766)
diff --git a/changes/changelog.d/767.bugfix b/changes/changelog.d/767.bugfix
deleted file mode 100644
index 8a2bbdb86c9442373863c36323517b5db4e2f0d0..0000000000000000000000000000000000000000
--- a/changes/changelog.d/767.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken Activity and Actor modules in django admin (#767)
diff --git a/changes/changelog.d/docker-mono.bugfix b/changes/changelog.d/docker-mono.bugfix
deleted file mode 100644
index 648ccb44605773242bec0e83c444f0629ab47135..0000000000000000000000000000000000000000
--- a/changes/changelog.d/docker-mono.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid mixed content when deploying mono-container behind HTTPS proxy (thetarkus/docker-funkwhale#19)
diff --git a/changes/changelog.d/null-position.bugfix b/changes/changelog.d/null-position.bugfix
deleted file mode 100644
index a3c7b5a028670a9c65c8d611ee41ba1770980c77..0000000000000000000000000000000000000000
--- a/changes/changelog.d/null-position.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a crash when federating a track with unspecified position
diff --git a/changes/notes.rst b/changes/notes.rst
index a08d3a61d770890020fd81482d54be5fb3b1e68d..96ac3d7651f92166072a2fb200c0dd57606851e3 100644
--- a/changes/notes.rst
+++ b/changes/notes.rst
@@ -5,16 +5,3 @@ Next release notes
 
     Those release notes refer to the current development branch and are reset
     after each release.
-
-
-Avoid mixed content when deploying mono-container behind proxy [Manual action required]
----------------------------------------------------------------------------------------------
-
-*You are only concerned if you use the mono-container docker deployment behind a reverse proxy*
-
-Because of `an issue in our mono-container configuration <https://github.com/thetarkus/docker-funkwhale/issues/19>`_, users deploying Funkwhale via docker
-using our `funkwhale/all-in-one` image could face some mixed content warnings (and possibly other troubles)
-when browsing the Web UI.
-
-This is fixed in this release, but on existing deployments, you'll need to add ``NESTED_PROXY=1`` in your container
-environment (either in your ``.env`` file, or via your container management tool), then recreate your funkwhale container.