diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index fa872de..b33cc70 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>
diff --git a/bundles/core/src/main/webapp/app-root/components/image/v3/image.json b/bundles/core/src/main/webapp/app-root/components/image/v3/image.json
index 787d3ff..eb551ec 100644
--- a/bundles/core/src/main/webapp/app-root/components/image/v3/image.json
+++ b/bundles/core/src/main/webapp/app-root/components/image/v3/image.json
@@ -29,6 +29,7 @@
                         /** Overwrite property to switch default value to unchecked */
                         "imageFromPageImage": {
                           "uncheckedValue": "false",
+                          "forceIgnoreFreshness": true,
                           "name": "./imageFromPageImage",
                           "text": "Inherit featured image from page",
                           "value": true,
diff --git a/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json b/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json
index 9530dc8..6f7adbc 100644
--- a/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json
+++ b/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json
@@ -130,6 +130,7 @@
                             "titleValueFromDAM": {
                               "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                               "uncheckedValue": "false",
+                              "forceIgnoreFreshness": true,
                               "name": "./titleValueFromDAM",
                               "text": "Get caption from DAM",
                               "value": true,
@@ -143,6 +144,7 @@
                             "displayPopupTitle": {
                               "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                               "uncheckedValue": "false",
+                              "forceIgnoreFreshness": true,
                               "name": "./displayPopupTitle",
                               "text": "Display caption as pop-up",
                               "value": true,
@@ -207,6 +209,7 @@
                     "decorative": {
                       "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                       "uncheckedValue": "false",
+                      "forceIgnoreFreshness": true,
                       "name": "./isDecorative",
                       "text": "Image is decorative",
                       "value": true,
@@ -215,6 +218,7 @@
                     "altValueFromDAM": {
                       "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                       "uncheckedValue": "false",
+                      "forceIgnoreFreshness": true,
                       "name": "./altValueFromDAM",
                       "text": "Get alternative text from DAM",
                       "value": true,
@@ -224,6 +228,7 @@
                     "titleValueFromDAM": {
                       "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                       "uncheckedValue": "false",
+                      "forceIgnoreFreshness": true,
                       "name": "./titleValueFromDAM",
                       "text": "Get caption from DAM",
                       "value": true,
@@ -233,6 +238,7 @@
                     "displayCaptionPopup": {
                       "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                       "uncheckedValue": "false",
+                      "forceIgnoreFreshness": true,
                       "name": "./displayPopupTitle",
                       "text": "Display caption as pop-up",
                       "value": true,
@@ -242,6 +248,7 @@
                     "disableUuidTracking": {
                       "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                       "uncheckedValue": "false",
+                      "forceIgnoreFreshness": true,
                       "name": "./uuidDisabled",
                       "text": "Disable UUID tracking",
                       "value": true,
@@ -282,6 +289,7 @@
                               "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
                               "uncheckedValue": false,
                               "granite:class": "js-cq-ImageEditor-allowUpload",
+                              "forceIgnoreFreshness": true,
                               "name": "./allowUpload",
                               "text": "Allow asset upload from file system",
                               "value": true,
diff --git a/changes.xml b/changes.xml
index 48c1ff8..8ff0568 100644
--- a/changes.xml
+++ b/changes.xml
@@ -23,6 +23,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.0.4-2.25.4" date="not released">
+      <action type="update" dev="sseifert" issue="22">
+        Update to AEM WCM Core Components 2.25.4.
+      </action>
+      <action type="update" dev="sseifert" issue="22"><![CDATA[
+        Image (v3) and Responsive Image (v1): Set forceIgnoreFreshness property on edit dialog properties with default value (related to <a href="https://github.com/adobe/aem-core-wcm-components/pull/2735">PR #2735</a>).
+      ]]></action>
+    </release>
+
     <release version="2.0.2-2.23.2" date="2024-03-13">
       <action type="fix" dev="sseifert" issue="20">
         Download (v1/v2): Don't display file size if it is not available.
diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml
index 3821dcd..e2da0ff 100644
--- a/examples/bundles/examples-core/pom.xml
+++ b/examples/bundles/examples-core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>2.0.3-2.23.2-SNAPSHOT</version>
+      <version>2.0.4-2.25.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml
index a2933a6..b8bf385 100644
--- a/examples/content-packages/examples-libs/pom.xml
+++ b/examples/content-packages/examples-libs/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>2.0.3-2.23.2-SNAPSHOT</version>
+      <version>2.0.4-2.25.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml
index 41f030e..81662bf 100644
--- a/examples/content-packages/examples-sample-content/pom.xml
+++ b/examples/content-packages/examples-sample-content/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples Content</name>
diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml
index 3883392..3a293ad 100644
--- a/examples/content-packages/examples/pom.xml
+++ b/examples/content-packages/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.samples</groupId>  
       <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-      <version>2.0.3-2.23.2-SNAPSHOT</version>
+      <version>2.0.4-2.25.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 3fb9d44..ae55a1c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f94bf2..c070418 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>WCM Core Components</name>
@@ -48,13 +48,13 @@
   </issueManagement>
 
   <properties>
-    <core.wcm.components.version>2.23.2</core.wcm.components.version>
+    <core.wcm.components.version>2.25.4</core.wcm.components.version>
 
     <sling.url>http://localhost:4502</sling.url>
     <sling.publish.url>http://localhost:4503</sling.publish.url>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-03-13T09:42:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-27T12:47:47Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index c98586a..750f865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.3-2.23.2-SNAPSHOT</version>
+    <version>2.0.4-2.25.4-SNAPSHOT</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.root</artifactId>
-  <version>2.0.3-2.23.2-SNAPSHOT</version>
+  <version>2.0.4-2.25.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>${site.url}/${site.url.module.prefix}/</url>
 
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 84c6db9..bcb76bd 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -35,6 +35,7 @@ There is currently no added wcm.io support for the Core Component AMP extensions
 
 |wcm.io WCM Core Components version | AEM Sites Core Component version | AEM version supported
 |-----------------------------------|----------------------------------|---------------------------------------------
+| 2.0.4-2.25.4                      | 2.25.4 and up                    | AEM 6.5.17, AEMaaCS
 | 2.0.x-2.23.2                      | 2.23.2, 2.24.6 and up            | AEM 6.5.17, AEMaaCS
 | 1.14.0-2.23.2                     | 2.23.2 and up                    | AEM 6.5.17, AEMaaCS
 | 1.13.0-2.22.6                     | 2.22.6 and up                    | AEM 6.5.14, AEMaaCS