diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 789b3ec..143af04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,4 +11,4 @@ jobs:
         secrets: inherit
         with:
           maven-args: --errors --batch-mode --show-version --update-snapshots --settings ci-settings.xml --color always --no-transfer-progress --activate-profiles github,nexus
-          verify-goal: --activate-profiles github,nexus,gpgsigning verify
+          verify-goal: -X --activate-profiles github,nexus,gpgsigning verify
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/.github/workflows/CI-java.yml b/maven-archetype-withparent/src/main/resources/archetype-resources/.github/workflows/CI-java.yml
index b26d822..b1b32c5 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/.github/workflows/CI-java.yml
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/.github/workflows/CI-java.yml
@@ -11,4 +11,4 @@ jobs:
         secrets: inherit
         with:
           maven-args: --errors --batch-mode --show-version --update-snapshots --settings ci-settings.xml --color always --no-transfer-progress
-          verify-goal: --activate-profiles jacoco,javadoc,gpgsigning verify
+          verify-goal: -X --activate-profiles jacoco,javadoc,gpgsigning verify
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/App.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/App.java
index 434ac29..dff6fc1 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/App.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/App.java
@@ -1,4 +1,4 @@
-package $package;
+package ${package};
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/module-info.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/module-info.java
index daead9a..8519f22 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/module-info.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 /**
  * A simple jigsaw module
  */
-module $package.$artifactId {
+module ${package}.${artifactId} {
     requires org.slf4j;
     requires ch.qos.logback.classic;
     requires static lombok;
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/package-info.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/package-info.java
index 08483c9..db6ac28 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/package-info.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/main/java/package-info.java
@@ -1,4 +1,4 @@
 /**
  * A simple package documentation
  */
-package $package;
\ No newline at end of file
+package ${package};
\ No newline at end of file
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test-integration/java/AppIT.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test-integration/java/AppIT.java
index 6cac6d2..124a3ba 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test-integration/java/AppIT.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test-integration/java/AppIT.java
@@ -1,4 +1,4 @@
-package $package;
+package ${package};
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/AppTest.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/AppTest.java
index 063c298..b3ff5cc 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/AppTest.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -1,4 +1,4 @@
-package $package;
+package ${package};
 
 import org.junit.jupiter.api.Test;
 
diff --git a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/SampleTest.java b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/SampleTest.java
index 57efb1b..ce1e887 100644
--- a/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/SampleTest.java
+++ b/maven-archetype-withparent/src/main/resources/archetype-resources/src/test/java/SampleTest.java
@@ -1,4 +1,4 @@
-package $package;
+package ${package};
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.*;
diff --git a/pom.xml b/pom.xml
index b34903d..c85e2ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,14 @@
         <repository>
             <id>github</id>
             <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/${github.account}/${project.artifactId}</url>
+            <!--url>https://maven.pkg.github.com/${github.account}/${project.artifactId}</url-->
+            <url>https://maven.pkg.github.com/ebpro/maven-archetypes</url>
         </repository>
         <snapshotRepository>
             <id>github</id>
             <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/${github.account}/${project.artifactId}</url>
+            <!--url>https://maven.pkg.github.com/${github.account}/${project.artifactId}</url-->
+            <url>https://maven.pkg.github.com/ebpro/maven-archetypes</url>
         </snapshotRepository>
 
         <site>