diff --git a/.gitignore b/.gitignore
index 3e0a9a7553..9f0ba136df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,99 +1,29 @@
-build
-
-External Plug-in Libraries
-org.eclipse.jetty.http/bin
-alpn-boot.jar
-.sonarlint
-org.adempiere.webstore/bin
-org.idempiere.hazelcast.service.config/bin
 */target/
-runtime-server.product
-org.idempiere.fitnesse.server/FitNesseRoot
-syntax: regexp
-adempiere
-org.adempiere.install/lib
-org.adempiere.install/bin/**
-org.adempiere.ui.zk/dist
-org.adempiere.ui.zk/bin/**
 **/lib/*.jar
 **/seed/*.jar
-db/ddlutils/lib/*.jar
-fitnesse/fitnesse.jar
-org.adempiere.ui.zk/labelapplet.jar
+/org.adempiere.ui.zk/labelapplet.jar
+/org.adempiere.extend/test.properties
 
-lib/plugins
-plugins/*.class
-adempiere-local.properties
-org.adempiere.extend/test.properties
-org.adempiere.extend/bin/**
-org.adempiere.ui/*.class
-org.adempiere.ui/bin/*.css
-org.adempiere.pipo.handlers/*.class
-org.adempiere.pipo/*.class
-org.adempiere.report.jasper.swing/*.class
-org.compiere.db.oracle.provider/bin/*.class
-org.compiere.db.postgresql.provider/bin/*.class
-org.adempiere.ui.swing/bin/**
-org.adempiere.report.jasper.fonts/bin/**
-
-org.adempiere.tomcat.config/META-INF/tomcat/server.xml
-org.apache.ecs/bin/*.class
-org.adempiere.replication/bin/*.class
-org.adempiere.replication.server/bin/**
-org.adempiere.server/bin/**
-org.adempiere.pipo.legacy/bin/*.class
-org.adempiere.base/bin/**
-org.adempiere.base.callout/bin/*.class
-org.adempiere.base.process/bin/*.class
-org.adempiere.payment.processor/bin/*.class
-org.adempiere.ui.swing.pluginlist/bin/*.class
-org.adempiere.plugin.utils/bin/*.class
-org.adempiere.webstore.servlet/bin/*.class
-org.adempiere.webstore.servlet/bin/*.tld
-org.adempiere.eclipse.equinox.servletbridge/bin/*.class
-org.adempiere.eclipse.equinox.http.servlet/bin/*.class
-org.adempiere.eclipse.equinox.http.servletbridge/bin/*.class
-org.adempiere.ui.zk.example/bin/*
-org.adempiere.webstore.resource/bin/*
-org.adempiere.webstore.resource/bin/*
-targetPlatform/*
-.metadata
-org.apache.ecs/bin/*
-keystore/*
-log/*
-PostgreSQL/*
-Oracle/*
-*.log
-Adempiere.properties
-idempiere.properties
-AdempiereEnv.properties
-idempiereEnv.properties
-event.test/bin*.class
-packages/*
-work/*
-hazelcast.xml
+/.metadata/
+/PostgreSQL/
+/Oracle/
+/log/
+/*.log
+/idempiere.properties
+/idempiereEnv.properties
+/hazelcast.xml
 
 swingclient.product*.launch
 server.product*.launch
 
-org.zkoss.zk.library/bin
-.class
+/RemoteSystemsTempFiles/
+External Plug-in Libraries
+.recommenders
 
-org.zkoss.zk.library/*/calendar*.jar
-org.zkoss.zk.library/*/ckez*.jar
-org.zkoss.zk.library/*/gmapsz*.jar
-org.zkoss.zk.library/*/jruby*.jar
-org.zkoss.zk.library/*/jython*.jar
-org.zkoss.zk.library/*/timelinez*.jar
-org.zkoss.zk.library/*/timeplotz*.jar
-org.zkoss.zk.library/*/z*.jar
-.buckminster/
-jettyhome/
-.recommenders/
-packin
-packout
-RemoteSystemsTempFiles
+/runtime-server.product/
+/jettyhome/
 
-fitnesse/FitNesseRoot/FitLibraryWeb/*.zip
+/org.idempiere.javadoc/API
 
-org.idempiere.javadoc/API
+/fitnesse/fitnesse.jar
+/fitnesse/FitNesseRoot/FitLibraryWeb/*.zip