diff --git a/demos/ec2/README.md b/demos/ec2/README.md
index ed98a29b65..c20b513cd8 100644
--- a/demos/ec2/README.md
+++ b/demos/ec2/README.md
@@ -6,7 +6,7 @@ Basic configuration of the [Amazon EC2 Plugin](https://plugins.jenkins.io/ec2)
 
 ```yaml
 x-ec2_anchor: &ec2_anchor
-  associatePublicIp: false
+  associateIPStrategy: PRIVATE_IP
   connectBySSHProcess: false
   connectionStrategy: PRIVATE_IP
   deleteRootOnTermination: false
diff --git a/demos/jenkins/jenkins.yaml b/demos/jenkins/jenkins.yaml
index 41843dd89b..fca6e32011 100644
--- a/demos/jenkins/jenkins.yaml
+++ b/demos/jenkins/jenkins.yaml
@@ -69,7 +69,7 @@ unclassified:
         retriever:
           modernSCM:
             scm:
-              git:
+              gitSource:
                 remote: "https://github.com/jenkins-infra/pipeline-library.git"
 
   location:
diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java
index 8b244f5bf9..e6450354e0 100644
--- a/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java
+++ b/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java
@@ -12,6 +12,7 @@
 
 import hudson.model.labels.LabelAtom;
 import hudson.plugins.ec2.AMITypeData;
+import hudson.plugins.ec2.AssociateIPStrategy;
 import hudson.plugins.ec2.EC2Cloud;
 import hudson.plugins.ec2.SlaveTemplate;
 import hudson.plugins.ec2.UnixData;
@@ -41,13 +42,13 @@ public void configure_ec2_cloud() {
 
         SlaveTemplate slaveTemplate = templates.get(0);
         assertThat(slaveTemplate.getDisplayName(), containsString("Auto configured EC2 Agent Small"));
-        assertFalse(slaveTemplate.getAssociatePublicIp());
         assertFalse(slaveTemplate.isConnectBySSHProcess());
         assertFalse(slaveTemplate.deleteRootOnTermination);
         assertFalse(slaveTemplate.ebsOptimized);
         assertFalse(slaveTemplate.monitoring);
         assertFalse(slaveTemplate.stopOnTerminate);
         assertFalse(slaveTemplate.useEphemeralDevices);
+        assertThat(slaveTemplate.getAssociateIPStrategy(), equalTo(AssociateIPStrategy.PRIVATE_IP));
         assertThat(slaveTemplate.type, is(InstanceType.T2_SMALL.toString()));
         assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
         assertThat(slaveTemplate.getLabelString(), containsString("Small"));
@@ -71,7 +72,7 @@ public void configure_ec2_cloud() {
 
         slaveTemplate = templates.get(1);
         assertThat(slaveTemplate.getDisplayName(), containsString("Auto configured EC2 Agent Large"));
-        assertFalse(slaveTemplate.getAssociatePublicIp());
+        assertThat(slaveTemplate.getAssociateIPStrategy(), equalTo(AssociateIPStrategy.PRIVATE_IP));
         assertFalse(slaveTemplate.isConnectBySSHProcess());
         assertFalse(slaveTemplate.deleteRootOnTermination);
         assertFalse(slaveTemplate.ebsOptimized);
diff --git a/pom.xml b/pom.xml
index 0b6968f3f1..8d5b2ac87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,9 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
     <jenkins.baseline>2.504</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
-    <plugin-bom.version>5294.va_d2e144c80e1</plugin-bom.version>
+    <plugin-bom.version>5577.vea_979d35b_b_ff</plugin-bom.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>