diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 5d18d66c..471e1456 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -62,7 +62,7 @@ jobs:
       run: chmod +x gradlew
     
     - name: Check code formatting
-      run: ./gradlew spotlessCheck --no-daemon || true
+      run: ./gradlew spotlessCheck --no-daemon
       env:
         GRADLE_OPTS: -Xmx2g -Dorg.gradle.daemon=false
     
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f0a0e2c..c1e6c5dc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,6 +84,15 @@ jobs:
           README.md \
           pnnl.goss.core/LICENSE
     
+    - name: Determine release version
+      id: release_version
+      run: |
+        # Strip the leading 'v' from the tag (v16.0.0 -> 16.0.0) so the
+        # asset glob below matches only this release's jars, not the
+        # full cnf/releaserepo/ history of every prior release.
+        version="${{ github.ref_name }}"
+        echo "version=${version#v}" >> "$GITHUB_OUTPUT"
+
     - name: Create GitHub Release
       uses: softprops/action-gh-release@v2
       with:
@@ -94,7 +103,7 @@ jobs:
         prerelease: ${{ contains(github.ref_name, 'rc') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
         files: |
           dist/*.tar.gz
-          cnf/releaserepo/**/*.jar
+          cnf/releaserepo/**/*-${{ steps.release_version.outputs.version }}.jar
         generate_release_notes: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pnnl.goss.core.itests/bnd.bnd b/pnnl.goss.core.itests/bnd.bnd
index 3e8426dd..d96d70fa 100644
--- a/pnnl.goss.core.itests/bnd.bnd
+++ b/pnnl.goss.core.itests/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 
 # Build dependencies - JUnit 5
 # Note: Using osgi-core-buildpath only (not full osgi-buildpath) to avoid javax.jms from osgi.enterprise
diff --git a/pnnl.goss.core.itests/itest.bnd b/pnnl.goss.core.itests/itest.bnd
index aa62f65b..3f6d507e 100644
--- a/pnnl.goss.core.itests/itest.bnd
+++ b/pnnl.goss.core.itests/itest.bnd
@@ -1,5 +1,5 @@
 # Modern OSGi Integration Test Configuration
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 
 # Use JUnit 5 and OSGi Test
 # Note: Using osgi-core-buildpath to avoid javax.jms from osgi.enterprise
diff --git a/pnnl.goss.core.runner/bnd.bnd b/pnnl.goss.core.runner/bnd.bnd
index 85661069..7acf484a 100644
--- a/pnnl.goss.core.runner/bnd.bnd
+++ b/pnnl.goss.core.runner/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 -buildpath: \
 	org.apache.felix.gogo.command,\
 	org.apache.felix.gogo.runtime,\
diff --git a/pnnl.goss.core.testutil/bnd.bnd b/pnnl.goss.core.testutil/bnd.bnd
index 82b29b1a..652a5b34 100644
--- a/pnnl.goss.core.testutil/bnd.bnd
+++ b/pnnl.goss.core.testutil/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 -buildpath: \
 	${configadmin-buildpath},\
 	pnnl.goss.core.core-api,\
diff --git a/pnnl.goss.core/core-api.bnd b/pnnl.goss.core/core-api.bnd
index 87879d59..9c4676c4 100644
--- a/pnnl.goss.core/core-api.bnd
+++ b/pnnl.goss.core/core-api.bnd
@@ -1,4 +1,4 @@
 Export-Package: \
 	com.northconcepts.exception,\
 	pnnl.goss.core
-Bundle-Version: 16.0.1-SNAPSHOT
\ No newline at end of file
+Bundle-Version: 16.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-client.bnd b/pnnl.goss.core/goss-client.bnd
index c443be45..81155a5e 100644
--- a/pnnl.goss.core/goss-client.bnd
+++ b/pnnl.goss.core/goss-client.bnd
@@ -1,3 +1,3 @@
 Export-Package:  \
 	pnnl.goss.core.client
-Bundle-Version: 16.0.1-SNAPSHOT
\ No newline at end of file
+Bundle-Version: 16.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-commands.bnd b/pnnl.goss.core/goss-core-commands.bnd
index 8b7ffe3a..c60c8c9c 100644
--- a/pnnl.goss.core/goss-core-commands.bnd
+++ b/pnnl.goss.core/goss-core-commands.bnd
@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.commands
-Bundle-Version: 16.0.1-SNAPSHOT
\ No newline at end of file
+Bundle-Version: 16.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-exceptions.bnd b/pnnl.goss.core/goss-core-exceptions.bnd
index 6b7396e0..ebb9a3bd 100644
--- a/pnnl.goss.core/goss-core-exceptions.bnd
+++ b/pnnl.goss.core/goss-core-exceptions.bnd
@@ -1,5 +1,5 @@
 Private-Package:  \
 	pnnl.goss.core.exception
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 Export-Package:  \
 	com.northconcepts.exception
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-security.bnd b/pnnl.goss.core/goss-core-security.bnd
index a5410449..c462df41 100644
--- a/pnnl.goss.core/goss-core-security.bnd
+++ b/pnnl.goss.core/goss-core-security.bnd
@@ -5,7 +5,7 @@ Private-Package:  \
 # The Activator class provides SecurityManager via @Component annotation
 Export-Package:  \
 	pnnl.goss.core.security
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 
 # Require FileInstall to be present in the runtime
 # FileInstall watches the conf directory for .cfg files and loads them into ConfigAdmin
diff --git a/pnnl.goss.core/goss-core-server-api.bnd b/pnnl.goss.core/goss-core-server-api.bnd
index 214e3703..83ce3634 100644
--- a/pnnl.goss.core/goss-core-server-api.bnd
+++ b/pnnl.goss.core/goss-core-server-api.bnd
@@ -1,3 +1,3 @@
 Export-Package:  \
 	pnnl.goss.core.server
-Bundle-Version: 16.0.1-SNAPSHOT
\ No newline at end of file
+Bundle-Version: 16.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-server-registry.bnd b/pnnl.goss.core/goss-core-server-registry.bnd
index 0f49dfb1..61a3eae1 100644
--- a/pnnl.goss.core/goss-core-server-registry.bnd
+++ b/pnnl.goss.core/goss-core-server-registry.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 Private-Package:  \
 	pnnl.goss.server.registry
 DynamicImport-Package: *
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-server-web.bnd b/pnnl.goss.core/goss-core-server-web.bnd
index 8d91642a..4abed7a3 100644
--- a/pnnl.goss.core/goss-core-server-web.bnd
+++ b/pnnl.goss.core/goss-core-server-web.bnd
@@ -2,7 +2,7 @@ DynamicImport-Package: *
 Private-Package:  \
 	pnnl.goss.core.server.web
 
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
 
 # Import webroot folder to path resources/webroot
 Include-Resource: resources/webroot=webroot
diff --git a/pnnl.goss.core/goss-core-server.bnd b/pnnl.goss.core/goss-core-server.bnd
index 581582ee..014c66ef 100644
--- a/pnnl.goss.core/goss-core-server.bnd
+++ b/pnnl.goss.core/goss-core-server.bnd
@@ -9,4 +9,4 @@ Import-Package: \
 	*
 #Include-Resource: \
 #	OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
-Bundle-Version: 16.0.1-SNAPSHOT
\ No newline at end of file
+Bundle-Version: 16.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/pnnl.goss.core/security-jwt.bnd b/pnnl.goss.core/security-jwt.bnd
index d685d2fa..7271bf92 100644
--- a/pnnl.goss.core/security-jwt.bnd
+++ b/pnnl.goss.core/security-jwt.bnd
@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.jwt
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
diff --git a/pnnl.goss.core/security-ldap.bnd b/pnnl.goss.core/security-ldap.bnd
index 74d7d926..1e52272b 100644
--- a/pnnl.goss.core/security-ldap.bnd
+++ b/pnnl.goss.core/security-ldap.bnd
@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.ldap
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
diff --git a/pnnl.goss.core/security-propertyfile.bnd b/pnnl.goss.core/security-propertyfile.bnd
index b7f1a0db..f9b25b5b 100644
--- a/pnnl.goss.core/security-propertyfile.bnd
+++ b/pnnl.goss.core/security-propertyfile.bnd
@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.propertyfile
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT
diff --git a/pnnl.goss.core/security-system.bnd b/pnnl.goss.core/security-system.bnd
index f42efa70..7c442976 100644
--- a/pnnl.goss.core/security-system.bnd
+++ b/pnnl.goss.core/security-system.bnd
@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.system
-Bundle-Version: 16.0.1-SNAPSHOT
+Bundle-Version: 16.0.0-SNAPSHOT