diff --git a/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php b/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php
index 7e575f5..492794d 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php
+++ b/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php
@@ -25,7 +25,7 @@ abstract class AbstractController
 	 * The active application
 	 *
 	 * @var    CMSApplication
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $app;
 
@@ -65,7 +65,7 @@ abstract class AbstractController
 	 *
 	 * @return  CMSApplication
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getApplication()
 	{
@@ -77,7 +77,7 @@ abstract class AbstractController
 	 *
 	 * @return  Input
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getInput()
 	{
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php b/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php
index 65ab112..086557e 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php
+++ b/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php
@@ -24,7 +24,7 @@ class DisplayController extends AbstractController
 	 * Default ordering value
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $defaultFullOrdering = 'a.pull_id DESC';
 
diff --git a/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php b/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php
index da89df3..8a65832 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php
+++ b/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php
@@ -14,7 +14,7 @@ use Joomla\Registry\Registry;
 /**
  * Base model for the patch testing component
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 abstract class AbstractModel
 {
@@ -22,7 +22,7 @@ abstract class AbstractModel
 	 * The database driver.
 	 *
 	 * @var    \JDatabaseDriver
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $db;
 
@@ -30,7 +30,7 @@ abstract class AbstractModel
 	 * The model state.
 	 *
 	 * @var    Registry
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $state;
 
@@ -40,7 +40,7 @@ abstract class AbstractModel
 	 * @param   Registry          $state  The model state.
 	 * @param   \JDatabaseDriver  $db     The database adpater.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __construct(Registry $state = null, \JDatabaseDriver $db = null)
 	{
@@ -53,7 +53,7 @@ abstract class AbstractModel
 	 *
 	 * @return  \JDatabaseDriver
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getDb()
 	{
@@ -65,7 +65,7 @@ abstract class AbstractModel
 	 *
 	 * @return  Registry
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getState()
 	{
@@ -79,7 +79,7 @@ abstract class AbstractModel
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setDb(\JDatabaseDriver $db)
 	{
@@ -93,7 +93,7 @@ abstract class AbstractModel
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setState(Registry $state)
 	{
diff --git a/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php b/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php
index e9d7a5a..e38a600 100644
--- a/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php
+++ b/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php
@@ -15,7 +15,7 @@ use PatchTester\Model\AbstractModel;
 /**
  * Base HTML view for the patch testing component
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 abstract class AbstractHtmlView extends AbstractView
 {
@@ -23,7 +23,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 * The view layout.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $layout = 'default';
 
@@ -31,7 +31,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 * The paths queue.
 	 *
 	 * @var    SplPriorityQueue
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $paths;
 
@@ -41,7 +41,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 * @param   AbstractModel     $model  The model object.
 	 * @param   SplPriorityQueue  $paths  The paths queue.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __construct(AbstractModel $model, \SplPriorityQueue $paths = null)
 	{
@@ -58,7 +58,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  string  The escaped output.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function escape($output)
 	{
@@ -71,7 +71,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  string  The layout name.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getLayout()
 	{
@@ -85,7 +85,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  mixed  The layout file name if found, false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getPath($layout)
 	{
@@ -103,7 +103,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  SplPriorityQueue  The paths queue.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getPaths()
 	{
@@ -117,7 +117,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  string  The output of the the template script.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  \RuntimeException
 	 */
 	public function loadTemplate($tpl = null)
@@ -162,7 +162,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  string  The rendered view.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 * @throws  RuntimeException
 	 */
 	public function render()
@@ -195,7 +195,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  $this
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setLayout($layout)
 	{
@@ -211,7 +211,7 @@ abstract class AbstractHtmlView extends AbstractView
 	 *
 	 * @return  $this
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setPaths(\SplPriorityQueue $paths)
 	{
diff --git a/administrator/components/com_patchtester/PatchTester/View/AbstractView.php b/administrator/components/com_patchtester/PatchTester/View/AbstractView.php
index 737f614..6dbeec3 100644
--- a/administrator/components/com_patchtester/PatchTester/View/AbstractView.php
+++ b/administrator/components/com_patchtester/PatchTester/View/AbstractView.php
@@ -13,7 +13,7 @@ use PatchTester\Model\AbstractModel;
 /**
  * Base view for the patch testing component
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 abstract class AbstractView
 {
@@ -21,7 +21,7 @@ abstract class AbstractView
 	 * The model object.
 	 *
 	 * @var    AbstractModel
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $model;
 
@@ -30,7 +30,7 @@ abstract class AbstractView
 	 *
 	 * @param   AbstractModel  $model  The model object.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __construct(AbstractModel $model)
 	{
@@ -44,7 +44,7 @@ abstract class AbstractView
 	 *
 	 * @return  string  The escaped output.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function escape($output)
 	{
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
index 730686f..a731d14 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
@@ -156,7 +156,7 @@ class PullsHtmlView extends DefaultHtmlView
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected function getLimitOptions()
 	{
diff --git a/administrator/components/com_patchtester/patchtester.xml b/administrator/components/com_patchtester/patchtester.xml
index 862f6a4..6817075 100644
--- a/administrator/components/com_patchtester/patchtester.xml
+++ b/administrator/components/com_patchtester/patchtester.xml
@@ -2,12 +2,12 @@
 <extension type="component" version="4.0" method="upgrade">
 	<name>com_patchtester</name>
 	<author>Joomla! Project</author>
-	<creationDate>17-October-2019</creationDate>
+	<creationDate>03-April-2020</creationDate>
 	<copyright>(C) 2011 - 2012 Ian MacLennan, (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>https://www.joomla.org</authorUrl>
-	<version>4.0.0-beta2</version>
+	<version>4.0.0-rc</version>
 	<description>COM_PATCHTESTER_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 	<install>
diff --git a/manifest.xml b/manifest.xml
index d5f521f..8959ca1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -7,9 +7,9 @@
 		<type>component</type>
 		<version>2.0.1</version>
 		<client>administrator</client>
-		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/2.0.1</infourl>
+		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/4.0.0</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/2.0.1/com_patchtester.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/4.0.0/com_patchtester.zip</downloadurl>
 		</downloads>
 		<sha384>f54a41cbfdc672fc1f0318adc179bf25412a1a1a89c1e2720c35c62740eb35b35f43421b72085270d0b17f3c4729aa64</sha384>
 		<tags>
@@ -24,9 +24,9 @@
 		<type>component</type>
 		<version>3.0.0-beta4</version>
 		<client>administrator</client>
-		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/3.0.0-beta4</infourl>
+		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/4.0.0</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/3.0.0-beta4/com_patchtester.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/4.0.0/com_patchtester.zip</downloadurl>
 		</downloads>
 		<sha384>dc5a4bf9d8d9f4ed9ce40d73885d543a2a8b3277e46519e8cf4759d8e1b5f0901b7d438033ffd0339afcb6d6a7536eb6</sha384>
 		<tags>
@@ -41,9 +41,9 @@
 		<type>component</type>
 		<version>4.0.0-beta2</version>
 		<client>administrator</client>
-		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/4.0.0-beta2</infourl>
+		<infourl title="Patch Tester Component">https://github.com/joomla-extensions/patchtester/releases/tag/4.0.0</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/4.0.0-beta2/com_patchtester.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/joomla-extensions/patchtester/releases/download/4.0.0/com_patchtester.zip</downloadurl>
 		</downloads>
 		<sha384>ca4d133df5dc3fc6ab69e08f95b39a342f8c0d0e76272ade5957e94a93134261ff3f5c870d1d23c6d0fdc12a65b75cd5</sha384>
 		<tags>