diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000..50638089
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+    <extension>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-build</artifactId>
+        <!-- Keep in sync with tycho-version in dbeaver-common/root/pom.xml. -->
+        <version>5.0.4</version>
+    </extension>
+</extensions>
diff --git a/bundles/org.dbvr.app.ce.test/build.properties b/bundles/org.dbvr.app.ce.test/build.properties
index 2ece76ba..08e5e9c9 100644
--- a/bundles/org.dbvr.app.ce.test/build.properties
+++ b/bundles/org.dbvr.app.ce.test/build.properties
@@ -1,3 +1,4 @@
+pom.model.packaging = eclipse-plugin
 source.. = src/
 output.. = target/classes/
 bin.includes = .,\
diff --git a/bundles/org.dbvr.app.ce.test/pom.xml b/bundles/org.dbvr.app.ce.test/pom.xml
deleted file mode 100644
index db8b7470..00000000
--- a/bundles/org.dbvr.app.ce.test/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.dbvr.ce</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>org.dbvr.app.ce.test</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/bundles/org.dbvr.app.ce/pom.xml b/bundles/org.dbvr.app.ce/pom.xml
deleted file mode 100644
index c64bfd0c..00000000
--- a/bundles/org.dbvr.app.ce/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.dbvr.ce</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>org.dbvr.app.ce</artifactId>
-    <version>26.2.5-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/bundles/org.dbvr.cli.sql/pom.xml b/bundles/org.dbvr.cli.sql/pom.xml
deleted file mode 100644
index 0a6241da..00000000
--- a/bundles/org.dbvr.cli.sql/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.dbvr.ce</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>org.dbvr.cli.sql</artifactId>
-    <version>1.0.24-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/bundles/org.dbvr.cli/pom.xml b/bundles/org.dbvr.cli/pom.xml
deleted file mode 100644
index 5edbb204..00000000
--- a/bundles/org.dbvr.cli/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.dbvr.ce</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>org.dbvr.cli</artifactId>
-    <version>1.0.24-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/test/org.dbvr.test.platform/build.properties b/test/org.dbvr.test.platform/build.properties
index ad3634d4..5e9d6790 100644
--- a/test/org.dbvr.test.platform/build.properties
+++ b/test/org.dbvr.test.platform/build.properties
@@ -1,3 +1,4 @@
+pom.model.packaging = eclipse-test-plugin
 source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\
diff --git a/test/org.dbvr.test.platform/pom.xml b/test/org.dbvr.test.platform/pom.xml
deleted file mode 100644
index 05091a50..00000000
--- a/test/org.dbvr.test.platform/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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.dbvr.ce</groupId>
-        <artifactId>tests</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>org.dbvr.test.platform</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>eclipse-test-plugin</packaging>
-
-</project>