diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 63ca7bc8..0acc664c 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -1,28 +1,29 @@
-#
-# Copyright (C) 2012-2022 Red Hat, Inc. (nos-devel@redhat.com)
-#
-# 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.
-#
-
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 version: 2
 updates:
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-
+    # wait after a new release till we create a PR, to reduce risk of pulling
+    # a compromised new version
+    cooldown:
+      default-days: 7
+      # Exclude our own repos from cooldown
+      # https://docs.github.com/en/code-security/reference/supply-chain-security/dependabot-options-reference#cooldown-
+      exclude:
+        - "org.jboss.da:*"
+        - "org.jboss.pnc*:*" # match org.jboss.pnc:xyz and org.jboss.pnc.group:xyz
+        - "org.commonjava*:*" # match org.commonjava:xyz and org.commonjava.group:xyz
   - package-ecosystem: "github-actions" # Also update Github actions
     directory: "/"
     schedule:
       # Check for updates to GitHub Actions every week
       interval: "weekly"
+    # wait after a new release till we create a PR, to reduce risk of pulling
+    # a compromised new version
+    cooldown:
+      default-days: 7
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 00000000..79c66cca
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,15 @@
+# From https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#creating-automatically-generated-release-notes-for-a-new-release
+changelog:
+  categories:
+    - title: 🐛 Fixes / 🚀 Enhancements
+      labels:
+        - '*'
+      exclude:
+        labels:
+          - dependencies
+    - title: 👒 Project Dependencies
+      labels:
+        - java
+    - title: 👒 CI Dependencies
+      labels:
+        - github_actions
diff --git a/.github/workflows/maven-mend.yml b/.github/workflows/maven-mend.yml
index a1412169..98b15706 100644
--- a/.github/workflows/maven-mend.yml
+++ b/.github/workflows/maven-mend.yml
@@ -19,7 +19,7 @@ jobs:
     uses: project-ncl/shared-github-actions/.github/workflows/maven-ci.yml@646d9b629925d6405fb06ed1476aefd6b2cdca86 # v0.0.23
     with:
       java_version: "11"
-      build_command: "MAVEN_OPTS='-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m' mvn -B -V clean verify -Prun-its -Pci"
+      build_command: "MAVEN_OPTS='-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m' mvn -B -V clean verify"
       upload_artifacts: true
 
   call-mend-ci:
diff --git a/.github/workflows/maven-pr.yml b/.github/workflows/maven-pr.yml
index 3d4cecd7..925a66c1 100644
--- a/.github/workflows/maven-pr.yml
+++ b/.github/workflows/maven-pr.yml
@@ -12,5 +12,5 @@ jobs:
     uses: project-ncl/shared-github-actions/.github/workflows/maven-ci.yml@646d9b629925d6405fb06ed1476aefd6b2cdca86 # v0.0.23
     with:
       java_version: "11"
-      build_command: "MAVEN_OPTS='-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m' mvn -B -V clean verify -Prun-its -Pci"
+      build_command: "MAVEN_OPTS='-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m' mvn -B -V clean verify"
       upload_artifacts: true
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index f9c459b7..7fefe9f5 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -17,7 +17,6 @@ jobs:
     with:
       java_version: "11"
       ref_to_release: ${{ inputs.ref_to_release }}
-      jboss_parent_override: "-DaltSnapshotDeploymentRepository=central-publisher::https://central.sonatype.com/repository/maven-snapshots/"
     secrets:
       SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
       SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index 0f52caaa..39ce5641 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -13,7 +13,6 @@ jobs:
       java_version: "11"
       project_name: "Commonjava/atlas"
       snapshot_deploy_command: "mvn help:effective-settings -B -V clean deploy -e"
-      jboss_parent_override: "-DaltSnapshotDeploymentRepository=central-publisher::https://central.sonatype.com/repository/maven-snapshots/"
     secrets:
       SONATYPE_USERNAME: ${{ secrets.SONATYPE_BOT_USERNAME }}
       SONATYPE_PASSWORD: ${{ secrets.SONATYPE_BOT_TOKEN }}
diff --git a/pom.xml b/pom.xml
index 635c5881..2180444c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>21</version>
+    <version>22</version>
   </parent>
 
   <groupId>org.commonjava.atlas</groupId>
@@ -145,4 +145,13 @@
     <module>relationships-api</module>
     <module>bindings</module>
   </modules>
+
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+    </repository>
+  </repositories>
 </project>