diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index a5a86e93f9..0000000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches: [ "main" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        cache: maven
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-        cache: 'yarn'
-        cache-dependency-path: report/report-ng/yarn.lock
-
-    - name: Publish to GitHub Packages
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: mvn -Dnode=system deploy
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 80467c0a09..effa8b9548 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         git config user.email "actions@github.com"
         git config user.name "GitHub Actions"
 
-    - name: Create release and publish to GitHub Packages
+    - name: Create release
       env:
         GITHUB_TOKEN: ${{ github.token }}
-      run: mvn -B -Dnode=system release:prepare release:perform
+      run: mvn -B -Dnode=system -Darguments="-Dmaven.deploy.skip=true" release:prepare release:perform
diff --git a/pom.xml b/pom.xml
index 73e77871e1..2a98791c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,15 +32,14 @@
 	<scm>
 		<connection>scm:git:https://github.com/Mastercard/flow.git</connection>
 		<developerConnection>scm:git:https://github.com/Mastercard/flow.git</developerConnection>
+		<tag>HEAD</tag>
 		<url>https://github.com/Mastercard/flow</url>
-	  <tag>HEAD</tag>
-  </scm>
+	</scm>
 
 	<distributionManagement>
 		<repository>
-			<id>github</id>
-			<name>GitHub Mastercard Apache Maven Packages</name>
-			<url>https://maven.pkg.github.com/Mastercard/flow</url>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
 
@@ -178,6 +177,8 @@
 						<lineSeparator>\n</lineSeparator>
 						<nrOfIndentSpace>-1</nrOfIndentSpace>
 						<createBackupFile>false</createBackupFile>
+						<expandEmptyElements>false</expandEmptyElements>
+						<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
 					</configuration>
 				</plugin>
 
@@ -288,7 +289,6 @@
 					<arguments>-Dnode=system -DexcludedGroups=avoid_on_release</arguments>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<lineSeparator>lf</lineSeparator>
-					<tagNameFormat>@{project.version}</tagNameFormat>
 				</configuration>
 			</plugin>
 
diff --git a/report/pom.xml b/report/pom.xml
index 50e194660a..bacb58589e 100644
--- a/report/pom.xml
+++ b/report/pom.xml
@@ -13,9 +13,6 @@
 		<module>report-core</module>
 		<module>report-ng</module>
 	</modules>
-	<dependencyManagement>
-		<dependencies />
-	</dependencyManagement>
 	<build>
 		<pluginManagement>
 			<plugins>
diff --git a/validation/pom.xml b/validation/pom.xml
index 912c64f1f2..58235a3af6 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -15,9 +15,6 @@
 		<module>validation-junit5</module>
 		<module>coppice</module>
 	</modules>
-	<dependencyManagement>
-		<dependencies />
-	</dependencyManagement>
 	<build>
 		<pluginManagement>
 			<plugins>