diff --git a/distribution/downloads/src/main/resources/files b/distribution/downloads/src/main/resources/files
index 068296cb67..05a08f6a57 100644
--- a/distribution/downloads/src/main/resources/files
+++ b/distribution/downloads/src/main/resources/files
@@ -5,24 +5,22 @@
     keycloak-api-docs-dist:keycloak-api-docs
     keycloak-examples-dist:keycloak-examples
 
-./adapters/keycloak-oidc
-    keycloak-as7-adapter-dist
-    keycloak-eap6-adapter-dist
-    keycloak-jetty92-adapter-dist
-    keycloak-jetty93-adapter-dist
-    keycloak-jetty94-adapter-dist
-    keycloak-js-adapter-dist
-    keycloak-tomcat-adapter-dist
-    keycloak-tomcat7-adapter-dist
-    keycloak-wildfly-adapter-dist
-    keycloak-fuse-adapter-dist
+    keycloak-as7-adapter-dist:keycloak-oidc-as7-adapter
+    keycloak-eap6-adapter-dist:keycloak-oidc-eap6-adapter
+    keycloak-jetty92-adapter-dist:keycloak-oidc-jetty92-adapter
+    keycloak-jetty93-adapter-dist:keycloak-oidc-jetty93-adapter
+    keycloak-jetty94-adapter-dist:keycloak-oidc-jetty94-adapter
+    keycloak-js-adapter-dist:keycloak-oidc-js-adapter
+    keycloak-tomcat-adapter-dist:keycloak-oidc-tomcat-adapter
+    keycloak-tomcat7-adapter-dist:keycloak-oidc-tomcat7-adapter
+    keycloak-wildfly-adapter-dist:keycloak-oidc-wildfly-adapter
+    keycloak-fuse-adapter-dist:keycloak-oidc-fuse-adapter
 
-./adapters/saml
-    keycloak-saml-as7-adapter-dist
-    keycloak-saml-eap6-adapter-dist
-    keycloak-saml-jetty92-adapter-dist
-    keycloak-saml-jetty93-adapter-dist
-    keycloak-saml-jetty94-adapter-dist
-    keycloak-saml-tomcat-adapter-dist
-    keycloak-saml-tomcat7-adapter-dist
-    keycloak-saml-wildfly-adapter-dist
+    keycloak-saml-as7-adapter-dist:keycloak-saml-as7-adapter
+    keycloak-saml-eap6-adapter-dist:keycloak-saml-eap6-adapter
+    keycloak-saml-jetty92-adapter-dist:keycloak-saml-jetty92-adapter
+    keycloak-saml-jetty93-adapter-dist:keycloak-saml-jetty93-adapter
+    keycloak-saml-jetty94-adapter-dist:keycloak-saml-jetty94-adapter
+    keycloak-saml-tomcat-adapter-dist:keycloak-saml-tomcat-adapter
+    keycloak-saml-tomcat7-adapter-dist:keycloak-saml-tomcat7-adapter
+    keycloak-saml-wildfly-adapter-dist:keycloak-saml-wildfly-adapter
diff --git a/release.sh b/release.sh
index ec33aec3ad..72b07b6652 100755
--- a/release.sh
+++ b/release.sh
@@ -9,21 +9,28 @@ echo "--------------------------------------------------------------------------
 echo "Building:"
 echo ""
 
-mvn -Pjboss-release,distribution-downloads -DskipTests -DskipTestsuite clean install
+mvn -Pjboss-release,distribution-downloads,nexus-staging -DskipTests -DskipTestsuite -DretryFailedDeploymentCount=10 -DautoReleaseAfterClose=true clean deploy
 
 
 echo "------------------------------------------------------------------------------------------------------------"
-echo "Deploying:"
+echo "Create tag:"
 echo ""
 
-mvn -Pjboss-release,nexus-staging -DretryFailedDeploymentCount=10 -DskipTests -DskipTestsuite -DskipExamples -DautoReleaseAfterClose=true deploy
+git tag $VERSION
+git push origin $VERSION
 
 
 echo "------------------------------------------------------------------------------------------------------------"
-echo "Upload to jboss.org:"
+echo "Upload to GitHub releases:"
 echo ""
 
-rsync -rv --protocol=28 distribution/downloads/target/$VERSION keycloak@filemgmt.jboss.org:/downloads_htdocs/keycloak
+hub release create -m "$VERSION" $VERSION
+cd distribution/downloads/target/$VERSION
+
+for i in *; do
+  echo "Uploading $i"
+  hub release edit -a $i -m "" $VERSION
+done
 
 
 echo "------------------------------------------------------------------------------------------------------------"