diff --git a/product/updateSite/site.xml b/product/updateSite/category.xml
similarity index 92%
rename from product/updateSite/site.xml
rename to product/updateSite/category.xml
index 03631c2969accde4ac8be59c5d18992f5610d58b..e6189e09d6aa56f30f9c4974bf78d38bccd508b9 100644
--- a/product/updateSite/site.xml
+++ b/product/updateSite/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <description name="DBeaver Update Site" url="http://dbeaver.jkiss.org/update/3.0">DBeaver Update Site</description>
+    <description name="DBeaver Update Site" url="http://dbeaver.jkiss.org/update/latest">DBeaver Update Site</description>
     <category-def name="org.jkiss.dbeaver" label="DBeaver">
         <description>Universal Database Manager</description>
     </category-def>
diff --git a/product/updateSite/pom.xml b/product/updateSite/pom.xml
index 1b03cab963bc584f48791bfd5808124021107c7d..1768dc4536e36bfa13a97f38c8f453b69557d425 100644
--- a/product/updateSite/pom.xml
+++ b/product/updateSite/pom.xml
@@ -1,14 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jkiss.dbeaver</groupId>
+        <artifactId>dbeaver</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    <artifactId>dbeaver-update</artifactId>
     <version>1.0.0</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <artifactId>updateSite</artifactId>
-  <version>1.0.0</version>
-  <packaging>eclipse-update-site</packaging>
+    <packaging>eclipse-repository</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/repository</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>siteTemplate</directory>
+                                    <includes>
+                                        <include>index.html</include>
+                                        <include>web/*</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>.</directory>
+                                    <includes>
+                                        <include>category.xml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/product/updateSite/index.html b/product/updateSite/siteTemplate/index.html
similarity index 93%
rename from product/updateSite/index.html
rename to product/updateSite/siteTemplate/index.html
index bef39d435034f3840afc8db47d371763c792d5f7..3ef7d5966a9eec9b3be1adaf37d81b338d3517aa 100644
--- a/product/updateSite/index.html
+++ b/product/updateSite/siteTemplate/index.html
@@ -13,7 +13,7 @@
 			xmlFile = document.implementation.createDocument("", "", null);
 			stylesheet = document.implementation.createDocument("", "", null);
 			if (xmlFile.load){
-				xmlFile.load("site.xml");
+				xmlFile.load("category.xml");
 				stylesheet.load("web/site.xsl");
 			} else {
 				alert("Document could not be loaded by browser.");
@@ -25,7 +25,7 @@
 		else if (window.ActiveXObject) {
 			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
 			xmlFile.async = false;
-			xmlFile.load("site.xml");
+			xmlFile.load("category.xml");
 			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
 			stylesheet.async = false;
 			stylesheet.load("web/site.xsl");
diff --git a/product/updateSite/web/site.css b/product/updateSite/siteTemplate/web/site.css
similarity index 100%
rename from product/updateSite/web/site.css
rename to product/updateSite/siteTemplate/web/site.css
diff --git a/product/updateSite/web/site.xsl b/product/updateSite/siteTemplate/web/site.xsl
similarity index 100%
rename from product/updateSite/web/site.xsl
rename to product/updateSite/siteTemplate/web/site.xsl