diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml
index 0718d58eb..6573f874e 100644
--- a/.github/workflows/gradle_publish.yml
+++ b/.github/workflows/gradle_publish.yml
@@ -33,7 +33,7 @@ jobs:
               CHANGED=${{ inputs.run_specific }}
             fi
           else #merge to master, detect specific changes
-            CHANGED=$(grep -F -o -f <(echo "$CHANGED") <(git diff --name-only HEAD~ HEAD))
+            CHANGED=$(grep -F -o -f <(echo "$CHANGED") <(git diff --name-only HEAD~ HEAD) | sort -u)
           fi
           
           CHANGED=$(echo -n "$CHANGED" | base64 -w 0)
@@ -62,9 +62,9 @@ jobs:
           echo "Publishing ${{ matrix.project }}"
           VERSION=$(./gradlew --quiet :${{ matrix.project }}:printVersion)
           if [ "${{ github.event_name }}" = "push" ]; then
-            VERSION="${VERSION}-SNAPSHOT"
+            ./gradlew :${{ matrix.project }}:publish -PbuildType="dev"
+          else
+            ./gradlew :${{ matrix.project }}:publish
           fi
-          ./gradlew :${{ matrix.project }}:build -Pversion="$VERSION" -x test
-          ./gradlew :${{ matrix.project }}:publish -Pversion="$VERSION"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 969c93948..bc783653d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -262,6 +262,10 @@ subprojects {
       dep.exclude group: 'org.vast.opengis'
     }
     
+    if(project.buildType && project.buildType.equals('dev')) {
+      p.setVersion(p.version + '-SNAPSHOT')
+    }
+    
     p.osgi {
       manifest {
         // main info
diff --git a/gradle.properties b/gradle.properties
index c92008e8a..486cc2ef1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=512m
+buildType=release