diff --git a/README.md b/README.md
index a98b661..180aab0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Validators
-![build](https://github.com/xlate/validators/workflows/build/badge.svg?branch=master) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=xlate_validators&metric=coverage)](https://sonarcloud.io/summary/new_code?id=xlate_validators) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xlate_staedi&metric=alert_status)](https://sonarcloud.io/dashboard?id=xlate_validators)
+![build](https://github.com/xlate/validators/actions/workflows/build.yml/badge.svg?branch=master) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=xlate_validators&metric=coverage)](https://sonarcloud.io/summary/new_code?id=xlate_validators) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xlate_staedi&metric=alert_status)](https://sonarcloud.io/dashboard?id=xlate_validators)
 
 Additional Bean Validators for Java
 
diff --git a/pom.xml b/pom.xml
index 9b444db..2036167 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
   <name>Additional Bean Validators for Java</name>
   <description>Additional validators and annotations for use with Java Bean Validation (JSR-303)</description>
   <url>https://github.com/xlate/validators</url>
+  <inceptionYear>2017</inceptionYear>
 
   <issueManagement>
     <url>https://github.com/xlate/validators/issues</url>
@@ -30,6 +31,11 @@
     </license>
   </licenses>
 
+  <organization>
+    <name>xlate.io LLC</name>
+    <url>http://www.xlate.io/</url>
+  </organization>
+
   <developers>
     <developer>
       <name>Michael Edgar</name>
diff --git a/src/main/java/io/xlate/validation/constraints/DateTime.java b/src/main/java/io/xlate/validation/constraints/DateTime.java
index 7ec2d38..691d42e 100644
--- a/src/main/java/io/xlate/validation/constraints/DateTime.java
+++ b/src/main/java/io/xlate/validation/constraints/DateTime.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
diff --git a/src/main/java/io/xlate/validation/constraints/Expression.java b/src/main/java/io/xlate/validation/constraints/Expression.java
index f2c0414..2e82a36 100644
--- a/src/main/java/io/xlate/validation/constraints/Expression.java
+++ b/src/main/java/io/xlate/validation/constraints/Expression.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
diff --git a/src/main/java/io/xlate/validation/constraints/JdbcStatement.java b/src/main/java/io/xlate/validation/constraints/JdbcStatement.java
index 3b742e8..1858e97 100644
--- a/src/main/java/io/xlate/validation/constraints/JdbcStatement.java
+++ b/src/main/java/io/xlate/validation/constraints/JdbcStatement.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
diff --git a/src/main/java/io/xlate/validation/internal/constraintvalidators/DateTimeValidator.java b/src/main/java/io/xlate/validation/internal/constraintvalidators/DateTimeValidator.java
index 61207e6..de0f3d2 100644
--- a/src/main/java/io/xlate/validation/internal/constraintvalidators/DateTimeValidator.java
+++ b/src/main/java/io/xlate/validation/internal/constraintvalidators/DateTimeValidator.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.internal.constraintvalidators;
 
 import java.text.DateFormat;
diff --git a/src/main/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidator.java b/src/main/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidator.java
index 72db9ec..94397a2 100644
--- a/src/main/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidator.java
+++ b/src/main/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidator.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.internal.constraintvalidators;
 
 import java.util.Arrays;
diff --git a/src/main/java/io/xlate/validation/internal/constraintvalidators/JdbcStatementValidator.java b/src/main/java/io/xlate/validation/internal/constraintvalidators/JdbcStatementValidator.java
index a0489bb..44ea68f 100644
--- a/src/main/java/io/xlate/validation/internal/constraintvalidators/JdbcStatementValidator.java
+++ b/src/main/java/io/xlate/validation/internal/constraintvalidators/JdbcStatementValidator.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.internal.constraintvalidators;
 
 import java.sql.Connection;
diff --git a/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorIT.java b/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorIT.java
index 0c3b6b7..5959e58 100644
--- a/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorIT.java
+++ b/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorIT.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.internal.constraintvalidators;
 
 import java.lang.reflect.Method;
diff --git a/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorTest.java b/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorTest.java
index acdb927..b8c35e9 100644
--- a/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorTest.java
+++ b/src/test/java/io/xlate/validation/internal/constraintvalidators/ExpressionValidatorTest.java
@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright (C) 2018 xlate.io LLC, http://www.xlate.io
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program 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 Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
 package io.xlate.validation.internal.constraintvalidators;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;