diff --git a/api/src/main/java/org/openmrs/FormResource.java b/api/src/main/java/org/openmrs/FormResource.java
index 2f701a49bd6a..401ab8cdd022 100644
--- a/api/src/main/java/org/openmrs/FormResource.java
+++ b/api/src/main/java/org/openmrs/FormResource.java
@@ -9,10 +9,7 @@
  */
 package org.openmrs;
 
-import java.util.Date;
-
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.envers.Audited;
 import org.openmrs.customdatatype.CustomDatatypeUtil;
 import org.openmrs.customdatatype.CustomValueDescriptor;
 import org.openmrs.customdatatype.NotYetPersistedException;
@@ -30,8 +27,7 @@
  *
  * @since 1.9
  */
-@Audited
-public class FormResource extends BaseOpenmrsObject implements CustomValueDescriptor, SingleCustomValue<FormResource> {
+public class FormResource extends BaseChangeableOpenmrsMetadata implements CustomValueDescriptor, SingleCustomValue<FormResource> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -55,10 +51,6 @@ public class FormResource extends BaseOpenmrsObject implements CustomValueDescri
 	
 	private transient Object typedValue;
 	
-	private User changedBy;
-	
-	private Date dateChanged;
-	
 	public FormResource() {
 		// generic constructor
 	}
@@ -272,31 +264,4 @@ public boolean getDirty() {
 		return dirty;
 	}
 	
-	/**
-	 * @return Returns the changedBy.
-	 */
-	public User getChangedBy() {
-		return changedBy;
-	}
-	
-	/**
-	 * @param changedBy The user that changed this object
-	 */
-	public void setChangedBy(User changedBy) {
-		this.changedBy = changedBy;
-	}
-	
-	/**
-	 * @return Returns the date this object was changed
-	 */
-	public Date getDateChanged() {
-		return dateChanged;
-	}
-	
-	/**
-	 * @param dateChanged The date this object was changed
-	 */
-	public void setDateChanged(Date dateChanged) {
-		this.dateChanged = dateChanged;
-	}
 }
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml
index 1cc135ca361e..2da22dd543a9 100644
--- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.5.x.xml
@@ -390,4 +390,102 @@
 		              tableName="encounter_diagnosis" />
 	</changeSet>
 
+	<changeSet id="20240813-form-resource-description" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="description"/>
+			</not>
+		</preConditions>
+		<comment>Adding "description" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="description" type="varchar(255)">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-creator" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="creator"/>
+			</not>
+		</preConditions>
+		<comment>Adding "creator" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="creator" type="int">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-date-created" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="date_created"/>
+			</not>
+		</preConditions>
+		<comment>Adding "date created" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="date_created" type="datetime">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-retired" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="retired"/>
+			</not>
+		</preConditions>
+		<comment>Adding "retired" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="retired" type="tinyint(1)">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-date-retired" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="date_retired"/>
+			</not>
+		</preConditions>
+		<comment>Adding "date created" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="date_retired" type="datetime">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-retired-by" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="retired_by"/>
+			</not>
+		</preConditions>
+		<comment>Adding "retired by" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="retired_by" type="int">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+
+	<changeSet id="20240813-form-resource-retired-reason" author="loliveira">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="form_resource" columnName="retired_reason"/>
+			</not>
+		</preConditions>
+		<comment>Adding "retired reason" column to form_resource table</comment>
+		<addColumn tableName="form_resource">
+			<column name="retired_reason" type="varchar(255)">
+				<constraints nullable="true"/>
+			</column>
+		</addColumn>
+	</changeSet>
+	
 </databaseChangeLog>
diff --git a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
index f22b4aee80ef..c735c1a8b574 100644
--- a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
+++ b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
@@ -30,7 +30,7 @@ public class DatabaseUpdaterDatabaseIT extends H2DatabaseIT {
 	 * This constant needs to be updated when adding new Liquibase update files to openmrs-core.
 	 */
 	
-	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 897;
+	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 904;
 
 	private static final int CHANGE_SET_COUNT_FOR_2_1_X = 870;