diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5a0a48cc..5dcc13a8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,6 @@
+<!--
+    SPDX-License-Identifier: Apache-2.0
+-->
 ---
 name: Bug report
 about: Create a report to help us improve
diff --git a/.github/ISSUE_TEMPLATE/compatibility-certification-request.md b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
index f12443a9..18b6f3d8 100644
--- a/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
+++ b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
@@ -1,3 +1,6 @@
+<!--
+    SPDX-License-Identifier: Apache-2.0
+-->
 ---
 name: Compatibility certification request
 about: Request certification of a compatibile implementation of Jakarta EE
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 24473dee..a3eb22be 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,3 +1,6 @@
+<!--
+    SPDX-License-Identifier: Apache-2.0
+-->
 ---
 name: Feature request
 about: Suggest an idea for this project
diff --git a/api/pom.xml b/api/pom.xml
index 01de5fa3..329e3873 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -38,7 +38,7 @@
 
 	<issueManagement>
 		<system>Jakarta CDI Issues</system>
-		<url>https://github.com/eclipse-ee4j/cdi/issues</url>
+		<url>https://github.com/jakarta/cdi/issues</url>
 	</issueManagement>
 
 	<inceptionYear>2008</inceptionYear>
@@ -121,10 +121,6 @@
 
 
 	<properties>
-		<annotation.api.version>3.0.0</annotation.api.version>
-		<atinject.api.version>2.0.1</atinject.api.version>
-		<uel.api.version>6.0.0</uel.api.version>
-		<interceptor.api.version>2.2.0</interceptor.api.version>
 		<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
 	</properties>
 
diff --git a/el/pom.xml b/el/pom.xml
index 4f95f101..ebc636f9 100644
--- a/el/pom.xml
+++ b/el/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
@@ -30,10 +30,6 @@
 		</license>
 	</licenses>
 
-	<properties>
-		<uel.api.version>6.0.0-M1</uel.api.version>
-	</properties>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/ide-config/pom.xml b/ide-config/pom.xml
index 38bae163..46e0e720 100644
--- a/ide-config/pom.xml
+++ b/ide-config/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>jakarta.enterprise</groupId>
         <artifactId>jakarta.enterprise.cdi-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdi-ide-config</artifactId>
diff --git a/lang-model/pom.xml b/lang-model/pom.xml
index ab5dd216..c81d517b 100644
--- a/lang-model/pom.xml
+++ b/lang-model/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.lang-model</artifactId>
diff --git a/pom.xml b/pom.xml
index d48d26b4..c2d31cdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<groupId>jakarta.enterprise</groupId>
 	<artifactId>jakarta.enterprise.cdi-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>4.1.0</version>
+	<version>4.1.0-SNAPSHOT</version>
 
 	<description>Parent module for CDI Specification</description>
 
@@ -117,6 +117,12 @@
 	</build>
 
 	<properties>
+		<!-- Definitions for the Jakarta EE API dependency versions -->
+		<annotation.api.version>3.0.0</annotation.api.version>
+		<atinject.api.version>2.0.1</atinject.api.version>
+		<uel.api.version>6.0.0</uel.api.version>
+		<interceptor.api.version>2.2.0</interceptor.api.version>
+
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<maven.compiler.release>11</maven.compiler.release>
diff --git a/spec/pom.xml b/spec/pom.xml
index ff9953c5..0548b5c2 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-spec-doc</artifactId>