diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..c8208d3af
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,34 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven and Deploy
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11 for Maven Central
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+        architecture: x64
+        server-id: ossrh
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+    - name: Publish to Maven Central
+      run: mvn deploy
+      env:
+        MAVEN_USERNAME: hap-java-dev
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+    - name: Publish site
+      run: mvn deploy-site
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e9a49816e..a07bff253 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -4,8 +4,6 @@
 name: Java CI with Maven
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..0aa72794f
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,39 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Stage Release on Master Branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: Version to release
+        required: true
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+        architecture: x64
+        server-id: ossrh
+        gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+    - name: Setup git profile
+      run: |
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+    - name: Maven release
+      run: mvn release:prepare release:perform -B -DreleaseVersion=${{ github.event.inputs.releaseVersion }} -Possrh
+      env:
+        MAVEN_USERNAME: hap-java-dev
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/README.md b/README.md
index 463f5d49b..9a9b3da86 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 HAP-Java
 =========
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.hap-java/hap/badge.svg)](https://search.maven.org/search?q=g:io.github.hap-java%20a:hap)
+[![MIT License](https://img.shields.io/github/license/hap-java/HAP-Java)](https://github.com/hap-java/HAP-Java/blob/master/LICENSE)
+![Maven Build Status](https://github.com/andylintner/HAP-Java/actions/workflows/maven.yml/badge.svg)
+
 HAP-Java is a Java implementation of the HomeKit Accessory Protocol.
 
 Using this library, you can create your own HomeKit Accessory or HomeKit Accessory Bridge.
diff --git a/RELEASING.md b/RELEASING.md
new file mode 100644
index 000000000..a3001c9f3
--- /dev/null
+++ b/RELEASING.md
@@ -0,0 +1,7 @@
+# How to release HAP-Java
+
+These actions can only be performed by someone with maintainer level access to the repository.
+
+1. Run the [Stage Release on Master Branch](https://github.com/hap-java/HAP-Java/actions/workflows/release.yml) Action
+2. After this completes, find the release on the [Releases page](https://github.com/hap-java/HAP-Java/releases)
+3. Edit the release to include the changelog details
diff --git a/deploy/distribution.xml b/deploy/distribution.xml
deleted file mode 100644
index a2cf6d668..000000000
--- a/deploy/distribution.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-  <id>dir-with-dependencies</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>false</unpack>
-      <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.jar</outputFileNameMapping>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/deploy/publish.sh b/deploy/publish.sh
deleted file mode 100755
index 1fb261646..000000000
--- a/deploy/publish.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [[ ( $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" ) ]]; then
-    mvn deploy --settings deploy/settings.xml -DperformRelease=true -DskipTests=true
-    exit $?
-fi
diff --git a/deploy/pubring.gpg.enc b/deploy/pubring.gpg.enc
deleted file mode 100644
index 1361f5a9f..000000000
Binary files a/deploy/pubring.gpg.enc and /dev/null differ
diff --git a/deploy/secring.gpg.enc b/deploy/secring.gpg.enc
deleted file mode 100644
index 1f1c31049..000000000
Binary files a/deploy/secring.gpg.enc and /dev/null differ
diff --git a/deploy/settings.xml b/deploy/settings.xml
deleted file mode 100644
index f08c008c0..000000000
--- a/deploy/settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<settings>
-    <servers>
-        <server>
-            <id>ossrh</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-    </servers>
-</settings>
diff --git a/pom.xml b/pom.xml
index 5faf6eafc..56f7f239f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 	<scm>
 		<connection>scm:git:https://github.com/hap-java/HAP-Java.git</connection>
-		<developerConnection>scm:git:git@github.com:hap-java/HAP-Java.git</developerConnection>
+		<developerConnection>scm:git:https://github.com/hap-java/HAP-Java.git</developerConnection>
 		<url>https://github.com/hap-java/HAP-Java.git</url>
 		<tag>HEAD</tag>
 	</scm>
@@ -208,24 +208,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.1.1</version>
-				<configuration>
-					<descriptors>
-						<descriptor>deploy/distribution.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- bind to the packaging phase -->
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-scm-publish-plugin</artifactId>
@@ -238,7 +220,7 @@
 							<goal>publish-scm</goal>
 						</goals>
 						<configuration>
-							<pubScmUrl>scm:git:git@github.com:hap-java/HAP-Java.git</pubScmUrl>
+							<pubScmUrl>scm:git:https://github.com/hap-java/HAP-Java.git</pubScmUrl>
 							<scmBranch>gh-pages</scmBranch>
 						</configuration>
 					</execution>
@@ -284,11 +266,11 @@
 		</site>
 		<repository>
 			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<snapshotRepository>
 			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 
@@ -305,6 +287,8 @@
 				<version>3.0.1</version>
 				<configuration>
 					<excludePackageNames>io.github.hapjava.server.impl</excludePackageNames>
+					<source>8</source>
+    				<detectJavaApiLink>false</detectJavaApiLink>
 				</configuration>
 				<reportSets>
 					<reportSet>
@@ -325,20 +309,6 @@
 	<profiles>
 		<profile>
 			<id>ossrh</id>
-			<properties>
-					<gpg.executable>gpg</gpg.executable>
-					<gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
-					<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
-					<gpg.defaultKeyring>false</gpg.defaultKeyring>
-					<gpg.publicKeyring>deploy/pubring.gpg</gpg.publicKeyring>
-					<gpg.secretKeyring>deploy/secring.gpg</gpg.secretKeyring>
-			</properties>
-			<activation>
-					<property>
-							<name>performRelease</name>
-							<value>true</value>
-					</property>
-			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -354,6 +324,12 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
@@ -362,17 +338,12 @@
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-release-plugin</artifactId>
-						<version>2.5.3</version>
-					</plugin>
 				</plugins>
-			</build>
+			</build> 
 		</profile>
 	</profiles>