diff --git a/build/assembly.xml b/build/assembly.xml
index de6e427..af0912b 100644
--- a/build/assembly.xml
+++ b/build/assembly.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>distro</id>
diff --git a/build/pom.xml b/build/pom.xml
index a90a73c..0775f30 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/galleon-feature-pack/galleon-content/assembly.xml b/galleon-feature-pack/galleon-content/assembly.xml
index f9a5d61..e620688 100644
--- a/galleon-feature-pack/galleon-content/assembly.xml
+++ b/galleon-feature-pack/galleon-content/assembly.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>galleon-pack-src</id>
diff --git a/galleon-feature-pack/galleon-content/pom.xml b/galleon-feature-pack/galleon-content/pom.xml
index f606c6b..ab92b0d 100644
--- a/galleon-feature-pack/galleon-content/pom.xml
+++ b/galleon-feature-pack/galleon-content/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/galleon-feature-pack/galleon-content/src/main/resources/modules/system/layers/base/org/wildfly/extension/vertx/main/module.xml b/galleon-feature-pack/galleon-content/src/main/resources/modules/system/layers/base/org/wildfly/extension/vertx/main/module.xml
index 52e55ff..695e9bd 100644
--- a/galleon-feature-pack/galleon-content/src/main/resources/modules/system/layers/base/org/wildfly/extension/vertx/main/module.xml
+++ b/galleon-feature-pack/galleon-content/src/main/resources/modules/system/layers/base/org/wildfly/extension/vertx/main/module.xml
@@ -1,15 +1,6 @@
 <!--
-  Copyright (C) 2020 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <module xmlns="urn:jboss:module:1.9" name="org.wildfly.extension.vertx">
     <properties>
diff --git a/galleon-feature-pack/pom.xml b/galleon-feature-pack/pom.xml
index 7f35767..e4941b4 100644
--- a/galleon-feature-pack/pom.xml
+++ b/galleon-feature-pack/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2023 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/galleon-feature-pack/wildfly-feature-pack/pom.xml b/galleon-feature-pack/wildfly-feature-pack/pom.xml
index c88037a..6672c91 100644
--- a/galleon-feature-pack/wildfly-feature-pack/pom.xml
+++ b/galleon-feature-pack/wildfly-feature-pack/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2023 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/galleon-feature-pack/wildfly-feature-pack/wildfly-feature-pack-build.xml b/galleon-feature-pack/wildfly-feature-pack/wildfly-feature-pack-build.xml
index e3611e1..fd63bcf 100644
--- a/galleon-feature-pack/wildfly-feature-pack/wildfly-feature-pack-build.xml
+++ b/galleon-feature-pack/wildfly-feature-pack/wildfly-feature-pack-build.xml
@@ -1,15 +1,6 @@
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 
 <build xmlns="urn:wildfly:feature-pack-build:3.1" producer="org.wildfly.extension.vertx:wildfly-vertx-feature-pack">
diff --git a/pom.xml b/pom.xml
index d4c1eac..b9a9df2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2020 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index e99e757..682ece8 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2020 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionRemoveHandler.java b/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionRemoveHandler.java
index 5b6f83b..9c0ae48 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionRemoveHandler.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionRemoveHandler.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionsResourceDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionsResourceDefinition.java
index 2d377bd..0caf597 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionsResourceDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/AbstractVertxOptionsResourceDefinition.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/AddressResolverResourceDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/AddressResolverResourceDefinition.java
index a994c9c..e35a5d8 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/AddressResolverResourceDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/AddressResolverResourceDefinition.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptions.java b/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptions.java
index 0a6f6ad..97f9482 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptions.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptions.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptionsService.java b/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptionsService.java
index ea6d43e..d12f61a 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptionsService.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/NamedVertxOptionsService.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxAttributes.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxAttributes.java
index c95d30f..1b58399 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxAttributes.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxAttributes.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxConstants.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxConstants.java
index eb5562a..dc10a59 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxConstants.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxConstants.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionFileResourceDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionFileResourceDefinition.java
index 4b061be..8495402 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionFileResourceDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionFileResourceDefinition.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsAttributes.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsAttributes.java
index 9b6fb52..9fd810b 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsAttributes.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsAttributes.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsRegistry.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsRegistry.java
index 0cc0628..d53452c 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsRegistry.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsRegistry.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsResourceDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsResourceDefinition.java
index 8809e68..841e459 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsResourceDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxOptionsResourceDefinition.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxy.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxy.java
index ac617e1..e022ce7 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxy.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxy.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.extension.vertx;
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyHolder.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyHolder.java
index 3fe711f..9a93a1a 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyHolder.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyHolder.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2023 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyService.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyService.java
index 35cd884..826f0fe 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyService.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxProxyService.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxResourceDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxResourceDefinition.java
index 4435f76..9b7463f 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxResourceDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxResourceDefinition.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemDefinition.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemDefinition.java
index 9e7351d..4433b96 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemDefinition.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.extension.vertx;
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemExtension.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemExtension.java
index e7b519f..5d450b4 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemExtension.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemExtension.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.extension.vertx;
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemParser_1_0.java b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemParser_1_0.java
index 2610ce8..a0ef871 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemParser_1_0.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/VertxSubsystemParser_1_0.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.extension.vertx;
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/logging/VertxLogger.java b/subsystem/src/main/java/org/wildfly/extension/vertx/logging/VertxLogger.java
index 43bf93a..f46e028 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/logging/VertxLogger.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/logging/VertxLogger.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.logging;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/CDIExtension.java b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/CDIExtension.java
index c3b67fc..f550ad0 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/CDIExtension.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/CDIExtension.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.processors;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/DeploymentInjectionProcessor.java b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/DeploymentInjectionProcessor.java
index bac7de9..23d5775 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/DeploymentInjectionProcessor.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/DeploymentInjectionProcessor.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.processors;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VerticleDeploymentMarkerProcessor.java b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VerticleDeploymentMarkerProcessor.java
index fe0c7e6..64c7a6c 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VerticleDeploymentMarkerProcessor.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VerticleDeploymentMarkerProcessor.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2024 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.processors;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDependenciesProcessor.java b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDependenciesProcessor.java
index 7224885..4c428dc 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDependenciesProcessor.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDependenciesProcessor.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2024 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.processors;
 
diff --git a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDeploymentAttachment.java b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDeploymentAttachment.java
index 679d91b..570d1a6 100644
--- a/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDeploymentAttachment.java
+++ b/subsystem/src/main/java/org/wildfly/extension/vertx/processors/VertxDeploymentAttachment.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2024 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.processors;
 
diff --git a/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
index 767003a..5cb8d43 100644
--- a/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
+++ b/subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
@@ -1 +1,6 @@
+#
+# Copyright The WildFly Authors
+# SPDX-License-Identifier: Apache-2.0
+#
+
 org.wildfly.extension.vertx.VertxSubsystemExtension
diff --git a/subsystem/src/main/resources/org/wildfly/extension/vertx/LocalDescriptions.properties b/subsystem/src/main/resources/org/wildfly/extension/vertx/LocalDescriptions.properties
index dc1a344..10ed3e9 100644
--- a/subsystem/src/main/resources/org/wildfly/extension/vertx/LocalDescriptions.properties
+++ b/subsystem/src/main/resources/org/wildfly/extension/vertx/LocalDescriptions.properties
@@ -1,3 +1,8 @@
+#
+# Copyright The WildFly Authors
+# SPDX-License-Identifier: Apache-2.0
+#
+
 vertx=Extension for Eclipse Vert.x
 vertx.add=Add Vertx Subsystem
 vertx.remove=Remove Vertx Subsystem
diff --git a/subsystem/src/main/resources/schema/wildfly-vertx_1_0_0.xsd b/subsystem/src/main/resources/schema/wildfly-vertx_1_0_0.xsd
index 299075c..e5d248f 100644
--- a/subsystem/src/main/resources/schema/wildfly-vertx_1_0_0.xsd
+++ b/subsystem/src/main/resources/schema/wildfly-vertx_1_0_0.xsd
@@ -1,15 +1,6 @@
 <!--
-  Copyright (C) 2020 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            targetNamespace="urn:wildfly:vertx:1.0"
diff --git a/subsystem/src/main/resources/subsystem-templates/vertx.xml b/subsystem/src/main/resources/subsystem-templates/vertx.xml
index aac74f9..2e964d1 100644
--- a/subsystem/src/main/resources/subsystem-templates/vertx.xml
+++ b/subsystem/src/main/resources/subsystem-templates/vertx.xml
@@ -1,4 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
 <config>
     <extension-module>org.wildfly.extension.vertx</extension-module>
     <subsystem xmlns="urn:wildfly:vertx:1.0"/>
diff --git a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemBaseParsingTestCase.java b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemBaseParsingTestCase.java
index ade22c9..9fa0aa2 100644
--- a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemBaseParsingTestCase.java
+++ b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemBaseParsingTestCase.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemOptionsTestCase.java b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemOptionsTestCase.java
index 50cb3f8..1759cdf 100644
--- a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemOptionsTestCase.java
+++ b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemOptionsTestCase.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2022 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemParsingTestCase.java b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemParsingTestCase.java
index 645a9d0..7cc3316 100644
--- a/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemParsingTestCase.java
+++ b/subsystem/src/test/java/org/wildfly/extension/vertx/VertxSubsystemParsingTestCase.java
@@ -1,17 +1,6 @@
 /*
- * Copyright (C) 2020 RedHat
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx;
 
diff --git a/subsystem/src/test/resources/org/wildfly/extension/vertx/vertx-options-full.xml b/subsystem/src/test/resources/org/wildfly/extension/vertx/vertx-options-full.xml
index 427c729..24a75bd 100644
--- a/subsystem/src/test/resources/org/wildfly/extension/vertx/vertx-options-full.xml
+++ b/subsystem/src/test/resources/org/wildfly/extension/vertx/vertx-options-full.xml
@@ -1,15 +1,6 @@
 <!--
-  Copyright (C) 2022 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 
 <subsystem xmlns="urn:wildfly:vertx:1.0">
diff --git a/testsuite/integration/basic/pom.xml b/testsuite/integration/basic/pom.xml
index 7abf750..5d8a01e 100644
--- a/testsuite/integration/basic/pom.xml
+++ b/testsuite/integration/basic/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/testsuite/integration/basic/src/test/config/arq/arquillian.xml b/testsuite/integration/basic/src/test/config/arq/arquillian.xml
index 3efaa2c..696dd74 100644
--- a/testsuite/integration/basic/src/test/config/arq/arquillian.xml
+++ b/testsuite/integration/basic/src/test/config/arq/arquillian.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
 <arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionNoReloadRequiredTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionNoReloadRequiredTestCase.java
index 7a223d7..211ed7d 100644
--- a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionNoReloadRequiredTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionNoReloadRequiredTestCase.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.basic.management;
 
diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionsManagementTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionsManagementTestCase.java
index aaf14d5..57e0c80 100644
--- a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionsManagementTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxOptionsManagementTestCase.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.basic.management;
 
diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxSubsystemTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxSubsystemTestCase.java
index 0b4fac4..405faf6 100644
--- a/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxSubsystemTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/wildfly/extension/vertx/test/basic/management/VertxSubsystemTestCase.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.basic.management;
 
diff --git a/testsuite/integration/basic/src/test/resources/logging.properties b/testsuite/integration/basic/src/test/resources/logging.properties
index c2019f4..17885c8 100644
--- a/testsuite/integration/basic/src/test/resources/logging.properties
+++ b/testsuite/integration/basic/src/test/resources/logging.properties
@@ -1,23 +1,6 @@
 #
-# JBoss, Home of Professional Open Source.
-# Copyright 2022, Red Hat, Inc., and individual contributors
-# as indicated by the @author tags. See the copyright.txt file in the
-# distribution for a full listing of individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright The WildFly Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # Additional logger names to configure (root logger is always configured)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 06334ff..43a00d9 100644
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 07576bd..69766dd 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml
index 6bd1350..42c8ae1 100644
--- a/testsuite/shared/pom.xml
+++ b/testsuite/shared/pom.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2021 RedHat
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/AbstractMgtTestBase.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/AbstractMgtTestBase.java
index 911ea44..f4e9e3d 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/AbstractMgtTestBase.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/AbstractMgtTestBase.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2023 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ManagementClientUtils.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ManagementClientUtils.java
index f1c9820..d15dd1d 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ManagementClientUtils.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ManagementClientUtils.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/StreamUtils.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/StreamUtils.java
index 967e741..79f55b5 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/StreamUtils.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/StreamUtils.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2022 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.wildfly.extension.vertx.test.shared;
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ejb/EchoService.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ejb/EchoService.java
index 5349430..79f9d99 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ejb/EchoService.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/ejb/EchoService.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2020 - 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared.ejb;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/RestApp.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/RestApp.java
index 033c8ea..2185fea 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/RestApp.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/RestApp.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2020 - 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared.rest;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/ServiceEndpoint.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/ServiceEndpoint.java
index 44d5f76..9d18820 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/ServiceEndpoint.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/rest/ServiceEndpoint.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2020 - 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared.rest;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AbstractVertxServlet.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AbstractVertxServlet.java
index 0cf6c5e..0345964 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AbstractVertxServlet.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AbstractVertxServlet.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2023 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared.servlet;
 
diff --git a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AsyncServlet.java b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AsyncServlet.java
index 448299c..d7a09a3 100644
--- a/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AsyncServlet.java
+++ b/testsuite/shared/src/main/java/org/wildfly/extension/vertx/test/shared/servlet/AsyncServlet.java
@@ -1,18 +1,6 @@
 /*
- *  Copyright (c) 2020 - 2021 The original author or authors
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of Apache License v2.0 which
- *  accompanies this distribution.
- *
- *       The Apache License v2.0 is available at
- *       http://www.opensource.org/licenses/apache2.0.php
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *  implied.  See the License for the specific language governing
- *  permissions and limitations under the License.
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package org.wildfly.extension.vertx.test.shared.servlet;