diff --git a/CHANGELOG.md b/CHANGELOG.md
index cab9e666..101cd8e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,49 @@
+Version 2.0.0
+=============
+
+* Estimate count on test-history page
+* Small improvements to the test history tab
+* Hide username/password related components when user login is disabled (#279)
+* Add test history tab to Result page (#276)
+* Address some issues raised by static analysis (#278)
+* Convert USER_LOGIN_ENABLED to bool if given as env var
+* Get a user's primary e-mail on GitHub if they have no public e-mail address (#272)
+* Add a way to disabled basic auth for non-superadmins
+* Add get_user_list endpoint
+* Fix keycloak login (#270)
+* Update docker image names (#267)
+* Show login progress feedback (#266)
+* Add build_deploy script for App-SRE builds (#265)
+* A single jUnit XML file is a single test run, refactor the importer to take this into account
+* Some code refactoring after static analysis. (#245)
+* Implement MetaFilter with separate field and value (#225)
+* Adjustments for app-sre deployment (#256)
+* Fix small FE bug on user profile page
+* Add superadmin user after upgrading db
+* Add a task for adding users/project owners
+* Add superadmin to the ocp template files
+* Add ability to create superadmin user on startup
+* Allow logging in by hitting 'Enter'
+* Require superadmin token for running admin task
+* Update pods script to create an admin user, a project, standardise on echo, and make the output prettier. (#247)
+* Some small fixes to ENV vars
+* Split templates into one file for each
+* Update @greatsumini/react-facebook-login
+* Fix Jenkins Job View
+* Allow superadmins to update projects
+* Support adding users to projects
+* Add project info to the profile page
+* Filter runs/results on user projects, if none specified
+* Bump url-parse from 1.5.1 to 1.5.3 in /frontend (#234)
+* Bump tmpl from 1.0.4 to 1.0.5 in /frontend (#233)
+* Bump tar from 6.1.0 to 6.1.11 in /frontend (#232)
+* Add authentication and authorisation to Ibutsu
+* Promote user property data to metadata
+* Add babel core dependency
+* Switch from 'babel-eslint' to '@babel/eslint-parser'
+* Update and re-apply pre-commit (#216)
+* Support adding artifacts to test runs (#215)
+
 Version 1.13.4
 ==============
 
diff --git a/backend/ibutsu_server/openapi/openapi.yaml b/backend/ibutsu_server/openapi/openapi.yaml
index 108a116a..f2cdd2b7 100644
--- a/backend/ibutsu_server/openapi/openapi.yaml
+++ b/backend/ibutsu_server/openapi/openapi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   description: A system to store and query test results
   title: Ibutsu API
-  version: 1.13.4
+  version: 2.0.0
 servers:
   - url: /api
 tags:
diff --git a/backend/setup.py b/backend/setup.py
index 8c68c83f..751c98c9 100644
--- a/backend/setup.py
+++ b/backend/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 NAME = "ibutsu_server"
-VERSION = "1.13.4"
+VERSION = "2.0.0"
 REQUIRES = [
     "alembic",
     # Pin Celery to be compatible with Kombu
diff --git a/frontend/package.json b/frontend/package.json
index 2c46df30..612659e2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ibutsu-frontend",
-  "version": "1.13.4",
+  "version": "2.0.0",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.15.8",