diff --git a/.classpath b/.classpath
index 1be2ca9..aad9f6b 100644
--- a/.classpath
+++ b/.classpath
@@ -14,32 +14,28 @@
 	</classpathentry>
 	<classpathentry kind="src" output="bin/test" path="build/generated/source/proto/test/java">
 		<attributes>
-			<attribute name="protobuf_generated_source" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/test" path="build/generated/source/proto/test/grpc">
 		<attributes>
-			<attribute name="protobuf_generated_source" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="build/generated/source/proto/main/java">
 		<attributes>
-			<attribute name="protobuf_generated_source" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="build/generated/source/proto/main/grpc">
 		<attributes>
-			<attribute name="protobuf_generated_source" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index 7759e1d..e889521 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,13 +1,2 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.0.2))
 connection.project.dir=
 eclipse.preferences.version=1
-gradle.user.home=
-java.home=/usr/lib/jvm/java-11-openjdk-amd64
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
diff --git a/build.gradle b/build.gradle
index 8773b46..ae4e2b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,15 @@ jar {
 repositories {
 	mavenLocal()
     mavenCentral()
+    maven {
+		// Adempiere GitHub Organization
+		url = 'https://maven.pkg.github.com/solop-develop/adempiere-solop'
+		credentials {
+			// project property, system properrty, enviroment variable
+			username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: System.getenv("GITHUB_DEPLOY_USER")
+			password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: System.getenv("GITHUB_DEPLOY_TOKEN")
+		}
+	}
     maven {
 		// Adempiere GitHub Organization
 		url = 'https://maven.pkg.github.com/adempiere/adempiere'
@@ -158,21 +167,10 @@ dependencies {
 	// ADempiere External Libraries
 	implementation 'io.vavr:vavr:0.10.4'
 
-	//	ADempiere Core
-	implementation "${baseGroupId}:base:${baseVersion}"
-
-	// ADempiere Projects with additional features
-	//	ADempiere gRPC Utils Base (https://central.sonatype.com/artifact/io.github.adempiere/adempiere-grpc-utils)
-	implementation "${baseGroupId}:adempiere-grpc-utils:1.5.4"
-	// AWS3 Connector to use as File Storagee (https://central.sonatype.com/artifact/io.github.adempiere/adempiere-s3-connector)
-	implementation "${baseGroupId}:adempiere-s3-connector:1.0.4"
-	implementation "${baseGroupId}:adempiere-jwt-token:1.0.3"
-	implementation "io.jsonwebtoken:jjwt-api:0.12.6"
-	implementation "io.jsonwebtoken:jjwt-impl:0.12.6"
-	implementation "io.jsonwebtoken:jjwt-jackson:0.12.6"
-
 	//	Others
 	compileOnly 'org.apache.tomcat:annotations-api:6.0.53'
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0'
 	implementation "org.apache.poi:poi-ooxml:5.2.5"
+	//	ADempiere Core + Patches + Features
+	implementation "com.solop:adempiere.solop_libs:3.9.4.001-1.2.6"
 }